diff --git a/system-config-printer-cancel-traceback.patch b/system-config-printer-cancel-traceback.patch
new file mode 100644
index 0000000..7bc3d02
--- /dev/null
+++ b/system-config-printer-cancel-traceback.patch
@@ -0,0 +1,11 @@
+diff -up system-config-printer-1.1.13/system-config-printer.py.cancel-traceback system-config-printer-1.1.13/system-config-printer.py
+--- system-config-printer-1.1.13/system-config-printer.py.cancel-traceback	2009-09-18 13:10:10.962438215 +0100
++++ system-config-printer-1.1.13/system-config-printer.py	2009-09-18 13:10:20.041314240 +0100
+@@ -3805,6 +3805,7 @@ class NewPrinterGUI(GtkGUI):
+         self.options = {} # keyword -> Option object
+         self.changed = set()
+         self.conflicts = set()
++        self.fetchDevices_op = None
+ 
+         combobox = self.cmbNPDownloadableDriverFoundPrinters
+         combobox.set_model (gtk.ListStore (str, str))
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 301f37a..4e76b48 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -16,6 +16,7 @@ Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-data-button-state.patch
+Patch2: system-config-printer-cancel-traceback.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -77,6 +78,7 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .data-button-state
+%patch2 -p1 -b .cancel-traceback
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -189,6 +191,7 @@ exit 0
 
 %changelog
 * Fri Sep 18 2009 Tim Waugh <twaugh@redhat.com> 1.1.13-2
+- Fixed traceback when cancelling change-driver dialog.
 - Fixed data button state.
 
 * Mon Sep 14 2009 Tim Waugh <twaugh@redhat.com> 1.1.13-1