diff --git a/.cvsignore b/.cvsignore
index be09678..b68029a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -211,3 +211,4 @@ pycups-1.9.47.tar.bz2
 system-config-printer-1.1.16.tar.xz
 pycups-1.9.48.tar.bz2
 system-config-printer-1.1.90.tar.xz
+system-config-printer-1.1.91.tar.xz
diff --git a/sources b/sources
index a1bf651..aabed93 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
 2e9ed692c75328e7fb88f8c230f70990  pycups-1.9.48.tar.bz2
-3c69710137034450ea9d869b4863e0b8  system-config-printer-1.1.90.tar.xz
+22c3cbe13faa3ef0935564de1b553fb9  system-config-printer-1.1.91.tar.xz
diff --git a/system-config-printer-1.1.90.tar.xz.sig b/system-config-printer-1.1.90.tar.xz.sig
deleted file mode 100644
index c2c439b..0000000
Binary files a/system-config-printer-1.1.90.tar.xz.sig and /dev/null differ
diff --git a/system-config-printer-1.1.91.tar.xz.sig b/system-config-printer-1.1.91.tar.xz.sig
new file mode 100644
index 0000000..a516382
Binary files /dev/null and b/system-config-printer-1.1.91.tar.xz.sig differ
diff --git a/system-config-printer-async-fallback-2.patch b/system-config-printer-async-fallback-2.patch
deleted file mode 100644
index 658b807..0000000
--- a/system-config-printer-async-fallback-2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up system-config-printer-1.1.90/asyncpk1.py.async-fallback-2 system-config-printer-1.1.90/asyncpk1.py
---- system-config-printer-1.1.90/asyncpk1.py.async-fallback-2	2010-01-18 17:38:54.000000000 +0000
-+++ system-config-printer-1.1.90/asyncpk1.py	2010-01-25 16:00:32.950084610 +0000
-@@ -299,15 +299,15 @@ class PK1Connection:
-     def _call_with_pk (self, use_pycups, pk_method_name, pk_args,
-                        reply_handler, error_handler, unpack_fn,
-                        fallback_fn, args, kwds):
-+        asyncmethodcall = _PK1AsyncMethodCall (self._system_bus, self,
-+                                               pk_method_name, pk_args,
-+                                               reply_handler,
-+                                               error_handler,
-+                                               unpack_fn, fallback_fn,
-+                                               args, kwds)
-+
-         if not use_pycups:
-             try:
--                asyncmethodcall = _PK1AsyncMethodCall (self._system_bus, self,
--                                                       pk_method_name, pk_args,
--                                                       reply_handler,
--                                                       error_handler,
--                                                       unpack_fn, fallback_fn,
--                                                       args, kwds)
--
-                 debugprint ("Calling PK method %s" % pk_method_name)
-                 asyncmethodcall.call ()
-             except dbus.DBusException, e:
diff --git a/system-config-printer-copy-printer.patch b/system-config-printer-copy-printer.patch
deleted file mode 100644
index 36a96b8..0000000
--- a/system-config-printer-copy-printer.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up system-config-printer-1.1.90/system-config-printer.py.copy-printer system-config-printer-1.1.90/system-config-printer.py
---- system-config-printer-1.1.90/system-config-printer.py.copy-printer	2010-01-19 13:06:19.000000000 +0000
-+++ system-config-printer-1.1.90/system-config-printer.py	2010-01-21 14:45:33.668150157 +0000
-@@ -3058,7 +3058,7 @@ class GUI(GtkGUI, monitor.Watcher):
-                 self.cups._end_operation ()
-                 return
- 
--        if self.copy_printer (new_name):
-+        if self.duplicate_printer (new_name):
-             # Failure.
-             self.monitor.update ()
- 
diff --git a/system-config-printer-duplicate-current.patch b/system-config-printer-duplicate-current.patch
deleted file mode 100644
index de27624..0000000
--- a/system-config-printer-duplicate-current.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up system-config-printer-1.1.90/system-config-printer.py.duplicate-current system-config-printer-1.1.90/system-config-printer.py
---- system-config-printer-1.1.90/system-config-printer.py.duplicate-current	2010-01-25 16:22:42.885084708 +0000
-+++ system-config-printer-1.1.90/system-config-printer.py	2010-01-25 16:22:56.142210328 +0000
-@@ -4757,7 +4757,7 @@ class NewPrinterGUI(GtkGUI):
-         self.fetchDevices_conn = None
- 
-         # Add the network devices to the list.
--        self.add_devices (result, current_uri)
-+        self.add_devices (result, current_uri, no_more=True)
- 
-     def get_hpfax_device_id(self, faxuri):
-         os.environ["URI"] = faxuri
-@@ -4910,16 +4910,18 @@ class NewPrinterGUI(GtkGUI):
-         self.fetchDevices_conn._begin_operation (_("fetching device list"))
-         self.fetchDevices (network=False, current_uri=current_uri)
- 
--    def add_devices (self, devices, current_uri):
-+    def add_devices (self, devices, current_uri, no_more=False):
-         if current_uri:
-             if devices.has_key (current_uri):
-                 current = devices.pop(current_uri)
-             elif devices.has_key (current_uri.replace (":9100", "")):
-                 current_uri = current_uri.replace (":9100", "")
-                 current = devices.pop(current_uri)
--            else:
-+            elif no_more:
-                 current = cupshelpers.Device (current_uri)
-                 current.info = "Current device"
-+            else:
-+                current_uri = None
- 
-         devices = devices.values()
- 
diff --git a/system-config-printer-lpd-model.patch b/system-config-printer-lpd-model.patch
deleted file mode 100644
index 52717bc..0000000
--- a/system-config-printer-lpd-model.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up system-config-printer-1.1.90/system-config-printer.py.lpd-model system-config-printer-1.1.90/system-config-printer.py
---- system-config-printer-1.1.90/system-config-printer.py.lpd-model	2010-01-25 16:31:03.394084803 +0000
-+++ system-config-printer-1.1.90/system-config-printer.py	2010-01-25 16:31:36.473209434 +0000
-@@ -5729,7 +5729,8 @@ class NewPrinterGUI(GtkGUI):
-         elif device.type=="lpd":
-             self.cmbentNPTLpdHost.child.set_text ('')
-             self.cmbentNPTLpdQueue.child.set_text ('')
--            self.cmbentNPTLpdQueue.get_model().clear ()
-+            model = gtk.ListStore (gobject.TYPE_STRING)
-+            self.cmbentNPTLpdQueue.set_model(model)
-             self.btnNPTLpdProbe.set_sensitive (False)
-             if len (device.uri) > 6:
-                 host = device.uri[6:]
-@@ -5790,8 +5791,8 @@ class NewPrinterGUI(GtkGUI):
-         printers = server.probe()
-         self.WaitWindow.hide ()
- 
--        model = self.cmbentNPTLpdQueue.get_model()
--        model.clear()
-+        model = gtk.ListStore (gobject.TYPE_STRING)
-+        self.cmbentNPTLpdQueue.set_model (model)
-         for printer in printers:
-             self.cmbentNPTLpdQueue.append_text(printer)
-         if printers:
diff --git a/system-config-printer-raw-statereason.patch b/system-config-printer-raw-statereason.patch
deleted file mode 100644
index a69e3f2..0000000
--- a/system-config-printer-raw-statereason.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up system-config-printer-1.1.90/statereason.py.raw-statereason system-config-printer-1.1.90/statereason.py
---- system-config-printer-1.1.90/statereason.py.raw-statereason	2010-01-19 11:18:46.000000000 +0000
-+++ system-config-printer-1.1.90/statereason.py	2010-01-25 15:58:21.721083889 +0000
-@@ -141,6 +141,7 @@ class StateReason:
-                 except (cups.IPPError, OSError):
-                     pass
- 
-+            reason = self.get_reason ()
-             if self._ppd:
-                 try:
-                     schemes = ["text", "http", "help", "file"]
-@@ -152,10 +153,8 @@ class StateReason:
-                             localized_reason = localized_reason + reason + ", "
-                     if localized_reason != "":
-                         reason = localized_reason[:-2]
--                    else:
--                        reason = self.get_reason()
-                 except RuntimeError:
--                    reason = self.get_reason()
-+                    pass
- 
-             text = _("Printer '%s': '%s'.") % (self.get_printer (), reason)
-         return (title, text)
diff --git a/system-config-printer-spinbuttons.patch b/system-config-printer-spinbuttons.patch
deleted file mode 100644
index d34fb02..0000000
--- a/system-config-printer-spinbuttons.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-diff -up system-config-printer-1.1.90/ui/PrinterPropertiesDialog.glade.spinbuttons system-config-printer-1.1.90/ui/PrinterPropertiesDialog.glade
---- system-config-printer-1.1.90/ui/PrinterPropertiesDialog.glade.spinbuttons	2010-01-19 11:18:46.000000000 +0000
-+++ system-config-printer-1.1.90/ui/PrinterPropertiesDialog.glade	2010-01-21 14:45:53.270150394 +0000
-@@ -1313,6 +1313,7 @@ See server settings&lt;/i&gt;</property>
-                                                       <object class="GtkSpinButton" id="sbJOBrightness">
-                                                         <property name="visible">True</property>
-                                                         <property name="can_focus">True</property>
-+                                                        <property name="adjustment">adjustment3</property>
-                                                         <property name="climb_rate">1</property>
-                                                         <accessibility>
-                                                           <relation type="labelled-by" target="label168"/>
-@@ -1415,6 +1416,7 @@ See server settings&lt;/i&gt;</property>
-                                                   <object class="GtkSpinButton" id="sbJOJobPriority">
-                                                     <property name="visible">True</property>
-                                                     <property name="can_focus">True</property>
-+                                                    <property name="adjustment">adjustment4</property>
-                                                     <property name="climb_rate">1</property>
-                                                     <accessibility>
-                                                       <relation type="labelled-by" target="label177"/>
-@@ -1671,7 +1673,9 @@ See server settings&lt;/i&gt;</property>
-                                           <object class="GtkSpinButton" id="sbJOCopies">
-                                             <property name="visible">True</property>
-                                             <property name="can_focus">True</property>
-+                                            <property name="adjustment">adjustment1</property>
-                                             <property name="climb_rate">1</property>
-+                                            <property name="numeric">True</property>
-                                             <accessibility>
-                                               <relation type="labelled-by" target="label138"/>
-                                             </accessibility>
-@@ -1835,6 +1839,7 @@ See server settings&lt;/i&gt;</property>
-                                               <object class="GtkSpinButton" id="sbJOScaling">
-                                                 <property name="visible">True</property>
-                                                 <property name="can_focus">True</property>
-+                                                <property name="adjustment">adjustment2</property>
-                                                 <property name="climb_rate">1</property>
-                                                 <accessibility>
-                                                   <relation type="labelled-by" target="label144"/>
-@@ -1916,6 +1921,7 @@ See server settings&lt;/i&gt;</property>
-                                                       <object class="GtkSpinButton" id="sbJOSaturation">
-                                                         <property name="visible">True</property>
-                                                         <property name="can_focus">True</property>
-+                                                        <property name="adjustment">adjustment5</property>
-                                                         <property name="climb_rate">1</property>
-                                                         <accessibility>
-                                                           <relation type="labelled-by" target="label170"/>
-@@ -1985,6 +1991,7 @@ See server settings&lt;/i&gt;</property>
-                                                       <object class="GtkSpinButton" id="sbJOHue">
-                                                         <property name="visible">True</property>
-                                                         <property name="can_focus">True</property>
-+                                                        <property name="adjustment">adjustment6</property>
-                                                         <property name="climb_rate">1</property>
-                                                         <accessibility>
-                                                           <relation type="labelled-by" target="label172"/>
-@@ -2039,6 +2046,7 @@ See server settings&lt;/i&gt;</property>
-                                                   <object class="GtkSpinButton" id="sbJOGamma">
-                                                     <property name="visible">True</property>
-                                                     <property name="can_focus">True</property>
-+                                                    <property name="adjustment">adjustment7</property>
-                                                     <property name="climb_rate">1</property>
-                                                     <accessibility>
-                                                       <relation type="labelled-by" target="label174"/>
-@@ -2199,6 +2207,7 @@ See server settings&lt;/i&gt;</property>
-                                                   <object class="GtkSpinButton" id="sbJOPageRight">
-                                                     <property name="visible">True</property>
-                                                     <property name="can_focus">True</property>
-+                                                    <property name="adjustment">adjustment11</property>
-                                                     <property name="climb_rate">1</property>
-                                                     <accessibility>
-                                                       <relation type="labelled-by" target="label156"/>
-@@ -2241,6 +2250,7 @@ See server settings&lt;/i&gt;</property>
-                                               <object class="GtkSpinButton" id="sbJOCpi">
-                                                 <property name="visible">True</property>
-                                                 <property name="can_focus">True</property>
-+                                                <property name="adjustment">adjustment8</property>
-                                                 <property name="climb_rate">1</property>
-                                                 <property name="digits">2</property>
-                                                 <accessibility>
-@@ -2280,6 +2290,7 @@ See server settings&lt;/i&gt;</property>
-                                               <object class="GtkSpinButton" id="sbJOLpi">
-                                                 <property name="visible">True</property>
-                                                 <property name="can_focus">True</property>
-+                                                <property name="adjustment">adjustment9</property>
-                                                 <property name="climb_rate">1</property>
-                                                 <property name="digits">2</property>
-                                                 <accessibility>
-@@ -2337,6 +2348,7 @@ See server settings&lt;/i&gt;</property>
-                                               <object class="GtkSpinButton" id="sbJOPageLeft">
-                                                 <property name="visible">True</property>
-                                                 <property name="can_focus">True</property>
-+                                                <property name="adjustment">adjustment10</property>
-                                                 <property name="climb_rate">1</property>
-                                                 <accessibility>
-                                                   <relation type="labelled-by" target="label154"/>
-@@ -2465,6 +2477,7 @@ See server settings&lt;/i&gt;</property>
-                                                   <object class="GtkSpinButton" id="sbJOColumns">
-                                                     <property name="visible">True</property>
-                                                     <property name="can_focus">True</property>
-+                                                    <property name="adjustment">adjustment14</property>
-                                                     <property name="climb_rate">1</property>
-                                                     <property name="numeric">True</property>
-                                                     <accessibility>
-@@ -2559,6 +2572,7 @@ See server settings&lt;/i&gt;</property>
-                                               <object class="GtkSpinButton" id="sbJOPageTop">
-                                                 <property name="visible">True</property>
-                                                 <property name="can_focus">True</property>
-+                                                <property name="adjustment">adjustment12</property>
-                                                 <property name="climb_rate">1</property>
-                                                 <accessibility>
-                                                   <relation type="labelled-by" target="label158"/>
-@@ -2615,6 +2629,7 @@ See server settings&lt;/i&gt;</property>
-                                               <object class="GtkSpinButton" id="sbJOPageBottom">
-                                                 <property name="visible">True</property>
-                                                 <property name="can_focus">True</property>
-+                                                <property name="adjustment">adjustment13</property>
-                                                 <property name="climb_rate">1</property>
-                                                 <accessibility>
-                                                   <relation type="labelled-by" target="label160"/>
-@@ -3244,4 +3259,103 @@ See server settings&lt;/i&gt;</property>
-       <action-widget response="-6">btnPrinterPropertiesClose</action-widget>
-     </action-widgets>
-   </object>
-+  <object class="GtkAdjustment" id="adjustment1">
-+    <property name="value">1</property>
-+    <property name="upper">1000</property>
-+    <property name="step_increment">1</property>
-+    <property name="page_increment">10</property>
-+    <property name="page_size">10</property>
-+  </object>
-+  <object class="GtkAdjustment" id="adjustment2">
-+    <property name="value">100</property>
-+    <property name="upper">1000</property>
-+    <property name="step_increment">1</property>
-+    <property name="page_increment">10</property>
-+    <property name="page_size">10</property>
-+  </object>
-+  <object class="GtkAdjustment" id="adjustment3">
-+    <property name="value">100</property>
-+    <property name="upper">1000</property>
-+    <property name="step_increment">1</property>
-+    <property name="page_increment">10</property>
-+    <property name="page_size">10</property>
-+  </object>
-+  <object class="GtkAdjustment" id="adjustment4">
-+    <property name="value">50</property>
-+    <property name="lower">1</property>
-+    <property name="upper">100</property>
-+    <property name="step_increment">1</property>
-+    <property name="page_increment">10</property>
-+    <property name="page_size">10</property>
-+  </object>
-+  <object class="GtkAdjustment" id="adjustment5">
-+    <property name="value">100</property>
-+    <property name="upper">1000</property>
-+    <property name="step_increment">1</property>
-+    <property name="page_increment">10</property>
-+    <property name="page_size">10</property>
-+  </object>
-+  <object class="GtkAdjustment" id="adjustment6">
-+    <property name="lower">-180</property>
-+    <property name="upper">180</property>
-+    <property name="step_increment">1</property>
-+    <property name="page_increment">10</property>
-+    <property name="page_size">10</property>
-+  </object>
-+  <object class="GtkAdjustment" id="adjustment7">
-+    <property name="value">1000</property>
-+    <property name="lower">1</property>
-+    <property name="upper">10000</property>
-+    <property name="step_increment">1</property>
-+    <property name="page_increment">10</property>
-+    <property name="page_size">10</property>
-+  </object>
-+  <object class="GtkAdjustment" id="adjustment8">
-+    <property name="value">10</property>
-+    <property name="lower">1</property>
-+    <property name="upper">100</property>
-+    <property name="step_increment">0.10000000000000001</property>
-+    <property name="page_increment">1</property>
-+    <property name="page_size">1</property>
-+  </object>
-+  <object class="GtkAdjustment" id="adjustment9">
-+    <property name="value">6</property>
-+    <property name="lower">1</property>
-+    <property name="upper">100</property>
-+    <property name="step_increment">0.10000000000000001</property>
-+    <property name="page_increment">1</property>
-+    <property name="page_size">1</property>
-+  </object>
-+  <object class="GtkAdjustment" id="adjustment10">
-+    <property name="upper">100</property>
-+    <property name="step_increment">1</property>
-+    <property name="page_increment">10</property>
-+    <property name="page_size">10</property>
-+  </object>
-+  <object class="GtkAdjustment" id="adjustment11">
-+    <property name="upper">100</property>
-+    <property name="step_increment">1</property>
-+    <property name="page_increment">10</property>
-+    <property name="page_size">10</property>
-+  </object>
-+  <object class="GtkAdjustment" id="adjustment12">
-+    <property name="upper">100</property>
-+    <property name="step_increment">1</property>
-+    <property name="page_increment">10</property>
-+    <property name="page_size">10</property>
-+  </object>
-+  <object class="GtkAdjustment" id="adjustment13">
-+    <property name="upper">100</property>
-+    <property name="step_increment">1</property>
-+    <property name="page_increment">10</property>
-+    <property name="page_size">10</property>
-+  </object>
-+  <object class="GtkAdjustment" id="adjustment14">
-+    <property name="value">1</property>
-+    <property name="lower">1</property>
-+    <property name="upper">4</property>
-+    <property name="step_increment">1</property>
-+    <property name="page_increment">1</property>
-+    <property name="page_size">1</property>
-+  </object>
- </interface>
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 72abdd1..b74d247 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -6,8 +6,8 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.1.90
-Release: 4%{?dist}
+Version: 1.1.91
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -16,12 +16,6 @@ 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-no-epydoc.patch
-Patch2: system-config-printer-copy-printer.patch
-Patch3: system-config-printer-spinbuttons.patch
-Patch4: system-config-printer-raw-statereason.patch
-Patch5: system-config-printer-async-fallback-2.patch
-Patch6: system-config-printer-duplicate-current.patch
-Patch7: system-config-printer-lpd-model.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -81,12 +75,6 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .no-epydoc
-%patch2 -p1 -b .copy-printer
-%patch3 -p1 -b .spinbuttons
-%patch4 -p1 -b .raw-statereason
-%patch5 -p1 -b .async-fallback-2
-%patch6 -p1 -b .duplicate-current
-%patch7 -p1 -b .lpd-model
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -202,7 +190,8 @@ rm -rf %buildroot
 exit 0
 
 %changelog
-* Mon Feb  8 2010 Tim Waugh <twaugh@redhat.com> - 1.1.90-4
+* Mon Feb  8 2010 Tim Waugh <twaugh@redhat.com> - 1.1.91-1
+- 1.1.91.
 - No longer requires usermode (bug #562270).
 
 * Mon Jan 25 2010 Tim Waugh <twaugh@redhat.com> - 1.1.90-3