diff --git a/.cvsignore b/.cvsignore
index e41da99..21c6c76 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -31,3 +31,4 @@ hplip-3.9.2.tar.gz
 hplip-3.9.6b.tar.gz
 hplip-3.9.8.tar.gz
 hplip-3.9.10.tar.gz
+hplip-3.9.12.tar.gz
diff --git a/hplip-3.9.10.tar.gz.asc b/hplip-3.9.10.tar.gz.asc
deleted file mode 100644
index 2ac3caa..0000000
--- a/hplip-3.9.10.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEABECAAYFAkrwszkACgkQhA7anpATwAUMowCdErRsdPydLdQ+AbMUnXmFK/9F
-IVEAoIDD5umpZ61yzDBUPfnvAALZUBfI
-=GQ71
------END PGP SIGNATURE-----
diff --git a/hplip-3.9.12.tar.gz.asc b/hplip-3.9.12.tar.gz.asc
new file mode 100644
index 0000000..36aaec5
--- /dev/null
+++ b/hplip-3.9.12.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEABECAAYFAksn/zgACgkQc9dwzaWQR7nJUACgrL1YrF8ct7EEdAvDwhcsRHxi
+Da4AnjHpD5VB3wwqYDEQp6Z0xGqDOhfO
+=+b+Q
+-----END PGP SIGNATURE-----
diff --git a/hplip-hpcups-plugin.patch b/hplip-hpcups-plugin.patch
deleted file mode 100644
index e466f31..0000000
--- a/hplip-hpcups-plugin.patch
+++ /dev/null
@@ -1,318 +0,0 @@
-diff -up hplip-3.9.8/prnt/drv/hpcups.drv.in.plugin hplip-3.9.8/prnt/drv/hpcups.drv.in
---- hplip-3.9.8/prnt/drv/hpcups.drv.in.plugin	2009-11-02 13:47:00.325103235 +0000
-+++ hplip-3.9.8/prnt/drv/hpcups.drv.in	2009-11-02 14:48:00.070102977 +0000
-@@ -6659,7 +6659,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet m1522nf MFP"
--      Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, $Version"
-+      Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet m1522nf MFP"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1522nf mfp;DES:hp laserjet m1522nf mfp;"
-       PCFileName "hp-laserjet_m1522nf_mfp-pcl3.ppd"
-@@ -6723,7 +6723,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet p2035n"
--      Attribute "NickName" "" "HP LaserJet p2035n pcl3, $Version"
-+      Attribute "NickName" "" "HP LaserJet p2035n pcl3, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet p2035n"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035n;DES:hp laserjet p2035n;"
-       PCFileName "hp-laserjet_p2035n-pcl3.ppd"
-@@ -6731,7 +6731,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet p2035"
--      Attribute "NickName" "" "HP LaserJet p2035 pcl3, $Version"
-+      Attribute "NickName" "" "HP LaserJet p2035 pcl3, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet p2035"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035;DES:hp laserjet p2035;"
-       PCFileName "hp-laserjet_p2035-pcl3.ppd"
-@@ -6864,7 +6864,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet m2727 MFP"
--      Attribute "NickName" "" "HP LaserJet m2727 MFP pcl3, $Version"
-+      Attribute "NickName" "" "HP LaserJet m2727 MFP pcl3, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet m2727 MFP"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m2727 mfp;DES:hp laserjet m2727 mfp;"
-       PCFileName "hp-laserjet_m2727_mfp-pcl3.ppd"
-@@ -7734,7 +7734,7 @@ Manufacturer "HP"
-     // <%LJColor:Normal%>
-     {
-       ModelName "HP Color LaserJet cm1312 MFP"
--      Attribute "NickName" "" "HP Color LaserJet cm1312 MFP pcl3, $Version"
-+      Attribute "NickName" "" "HP Color LaserJet cm1312 MFP pcl3, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP Color LaserJet cm1312 MFP"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312 mfp;DES:hp color laserjet cm1312 mfp;"
-       PCFileName "hp-color_laserjet_cm1312_mfp-pcl3.ppd"
-@@ -7742,7 +7742,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP Color LaserJet cm1312nfi MFP"
--      Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version"
-+      Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm1312nfi mfp;DES:hp color laserjet cm1312nfi mfp;"
-       PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd"
-@@ -7816,7 +7816,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP Color LaserJet cm2320 MFP"
--      Attribute "NickName" "" "HP Color LaserJet cm2320 MFP pcl3, $Version"
-+      Attribute "NickName" "" "HP Color LaserJet cm2320 MFP pcl3, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP Color LaserJet cm2320 MFP"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320 mfp;DES:hp color laserjet cm2320 mfp;"
-       PCFileName "hp-color_laserjet_cm2320_mfp-pcl3.ppd"
-@@ -7824,7 +7824,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP Color LaserJet cm2320fxi MFP"
--      Attribute "NickName" "" "HP Color LaserJet cm2320fxi MFP pcl3, $Version"
-+      Attribute "NickName" "" "HP Color LaserJet cm2320fxi MFP pcl3, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP Color LaserJet cm2320fxi MFP"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320fxi mfp;DES:hp color laserjet cm2320fxi mfp;"
-       PCFileName "hp-color_laserjet_cm2320fxi_mfp-pcl3.ppd"
-@@ -7832,7 +7832,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP Color LaserJet cm2320n MFP"
--      Attribute "NickName" "" "HP Color LaserJet cm2320n MFP pcl3, $Version"
-+      Attribute "NickName" "" "HP Color LaserJet cm2320n MFP pcl3, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP Color LaserJet cm2320n MFP"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320n mfp;DES:hp color laserjet cm2320n mfp;"
-       PCFileName "hp-color_laserjet_cm2320n_mfp-pcl3.ppd"
-@@ -7840,7 +7840,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP Color LaserJet cm2320nf MFP"
--      Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version"
-+      Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP Color LaserJet cm2320nf MFP"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm2320nf mfp;DES:hp color laserjet cm2320nf mfp;"
-       PCFileName "hp-color_laserjet_cm2320nf_mfp-pcl3.ppd"
-@@ -10287,7 +10287,7 @@ Manufacturer "HP"
-     // <%LJZjsMono:Normal%>
-     {
-       ModelName "HP LaserJet 1000"
--      Attribute "NickName" "" "HP LaserJet 1000, $Version"
-+      Attribute "NickName" "" "HP LaserJet 1000, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet 1000"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1000;DES:hp laserjet 1000;"
-       PCFileName "hp-laserjet_1000.ppd"
-@@ -10295,7 +10295,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet 1005 Series"
--      Attribute "NickName" "" "HP LaserJet 1005 Series, $Version"
-+      Attribute "NickName" "" "HP LaserJet 1005 Series, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet 1005 Series"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1005 series;DES:hp laserjet 1005 series;"
-       PCFileName "hp-laserjet_1005_series.ppd"
-@@ -10303,7 +10303,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet 1018"
--      Attribute "NickName" "" "HP LaserJet 1018, $Version"
-+      Attribute "NickName" "" "HP LaserJet 1018, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet 1018"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1018;DES:hp laserjet 1018;"
-       PCFileName "hp-laserjet_1018.ppd"
-@@ -10312,7 +10312,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet 1020"
--      Attribute "NickName" "" "HP LaserJet 1020, $Version"
-+      Attribute "NickName" "" "HP LaserJet 1020, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet 1020"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1020;DES:hp laserjet 1020;"
-       PCFileName "hp-laserjet_1020.ppd"
-@@ -10321,7 +10321,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet 1022nw"
--      Attribute "NickName" "" "HP LaserJet 1022nw zjs, $Version"
-+      Attribute "NickName" "" "HP LaserJet 1022nw zjs, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet 1022nw"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1022nw;DES:hp laserjet 1022nw;"
-       PCFileName "hp-laserjet_1022nw-zjs.ppd"
-@@ -10329,7 +10329,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet 1022n"
--      Attribute "NickName" "" "HP LaserJet 1022n zjs, $Version"
-+      Attribute "NickName" "" "HP LaserJet 1022n zjs, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet 1022n"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1022n;DES:hp laserjet 1022n;"
-       PCFileName "hp-laserjet_1022n-zjs.ppd"
-@@ -10338,7 +10338,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet 1022"
--      Attribute "NickName" "" "HP LaserJet 1022 zjs, $Version"
-+      Attribute "NickName" "" "HP LaserJet 1022 zjs, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet 1022"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet 1022;DES:hp laserjet 1022;"
-       PCFileName "hp-laserjet_1022-zjs.ppd"
-@@ -10346,7 +10346,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet m1120 MFP"
--      Attribute "NickName" "" "HP LaserJet m1120 MFP, $Version"
-+      Attribute "NickName" "" "HP LaserJet m1120 MFP, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet m1120 MFP"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1120 mfp;DES:hp laserjet m1120 mfp;"
-       PCFileName "hp-laserjet_m1120_mfp.ppd"
-@@ -10354,7 +10354,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet m1120n MFP"
--      Attribute "NickName" "" "HP LaserJet m1120n MFP, $Version"
-+      Attribute "NickName" "" "HP LaserJet m1120n MFP, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet m1120n MFP"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1120n mfp;DES:hp laserjet m1120n mfp;"
-       PCFileName "hp-laserjet_m1120n_mfp.ppd"
-@@ -10362,7 +10362,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet m1319f MFP"
--      Attribute "NickName" "" "HP LaserJet m1319f MFP, $Version"
-+      Attribute "NickName" "" "HP LaserJet m1319f MFP, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet m1319f MFP"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1319f mfp;DES:hp laserjet m1319f mfp;"
-       PCFileName "hp-laserjet_m1319f_mfp.ppd"
-@@ -10370,7 +10370,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet p2035n"
--      Attribute "NickName" "" "HP LaserJet p2035n zjs, $Version"
-+      Attribute "NickName" "" "HP LaserJet p2035n zjs, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet p2035n"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035n;DES:hp laserjet p2035n;"
-       PCFileName "hp-laserjet_p2035n-zjs.ppd"
-@@ -10378,7 +10378,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet p2035"
--      Attribute "NickName" "" "HP LaserJet p2035 zjs, $Version"
-+      Attribute "NickName" "" "HP LaserJet p2035 zjs, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet p2035"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2035;DES:hp laserjet p2035;"
-       PCFileName "hp-laserjet_p2035-zjs.ppd"
-@@ -10498,7 +10498,7 @@ Manufacturer "HP"
-     // <%LJZjsColor:Normal%>
-     {
-       ModelName "HP Color LaserJet cp1215"
--      Attribute "NickName" "" "HP Color LaserJet cp1215, $Version"
-+      Attribute "NickName" "" "HP Color LaserJet cp1215, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP Color LaserJet cp1215"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp1215;DES:hp color laserjet cp1215;"
-       PCFileName "hp-color_laserjet_cp1215.ppd"
-@@ -10506,7 +10506,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP Color LaserJet 1600"
--      Attribute "NickName" "" "HP Color LaserJet 1600, $Version"
-+      Attribute "NickName" "" "HP Color LaserJet 1600, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP Color LaserJet 1600"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 1600;DES:hp color laserjet 1600;"
-       PCFileName "hp-color_laserjet_1600.ppd"
-@@ -10514,7 +10514,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP Color LaserJet 2600n"
--      Attribute "NickName" "" "HP Color LaserJet 2600n, $Version"
-+      Attribute "NickName" "" "HP Color LaserJet 2600n, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP Color LaserJet 2600n"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet 2600n;DES:hp color laserjet 2600n;"
-       PCFileName "hp-color_laserjet_2600n.ppd"
-@@ -10791,7 +10791,7 @@ Manufacturer "HP"
-     // <%LJm1005:Normal%>
-     {
-       ModelName "HP LaserJet m1005"
--      Attribute "NickName" "" "HP LaserJet m1005, $Version"
-+      Attribute "NickName" "" "HP LaserJet m1005, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet m1005"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet m1005;DES:hp laserjet m1005;"
-       PCFileName "hp-laserjet_m1005.ppd"
-@@ -10799,7 +10799,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet p1505n"
--      Attribute "NickName" "" "HP LaserJet p1505n zxs, $Version"
-+      Attribute "NickName" "" "HP LaserJet p1505n zxs, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet p1505n"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1505n;DES:hp laserjet p1505n;"
-       PCFileName "hp-laserjet_p1505n-zxs.ppd"
-@@ -10807,7 +10807,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet p1505"
--      Attribute "NickName" "" "HP LaserJet p1505, $Version"
-+      Attribute "NickName" "" "HP LaserJet p1505, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet p1505"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1505;DES:hp laserjet p1505;"
-       PCFileName "hp-laserjet_p1505.ppd"
-@@ -10815,7 +10815,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet p2014"
--      Attribute "NickName" "" "HP LaserJet p2014 zxs, $Version"
-+      Attribute "NickName" "" "HP LaserJet p2014 zxs, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet p2014"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2014;DES:hp laserjet p2014;"
-       PCFileName "hp-laserjet_p2014-zxs.ppd"
-@@ -10823,7 +10823,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet p2014n"
--      Attribute "NickName" "" "HP LaserJet p2014n zxs, $Version"
-+      Attribute "NickName" "" "HP LaserJet p2014n zxs, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet p2014n"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p2014n;DES:hp laserjet p2014n;"
-       PCFileName "hp-laserjet_p2014n-zxs.ppd"
-@@ -10941,7 +10941,7 @@ Manufacturer "HP"
-     // <%LJP1XXX:Normal%>
-     {
-       ModelName "HP LaserJet p1005"
--      Attribute "NickName" "" "HP LaserJet p1005, $Version"
-+      Attribute "NickName" "" "HP LaserJet p1005, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet p1005"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1005;DES:hp laserjet p1005;"
-       PCFileName "hp-laserjet_p1005.ppd"
-@@ -10949,7 +10949,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet p1006"
--      Attribute "NickName" "" "HP LaserJet p1006, $Version"
-+      Attribute "NickName" "" "HP LaserJet p1006, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet p1006"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1006;DES:hp laserjet p1006;"
-       PCFileName "hp-laserjet_p1006.ppd"
-@@ -10957,7 +10957,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet p1007"
--      Attribute "NickName" "" "HP LaserJet p1007, $Version"
-+      Attribute "NickName" "" "HP LaserJet p1007, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet p1007"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1007;DES:hp laserjet p1007;"
-       PCFileName "hp-laserjet_p1007.ppd"
-@@ -10965,7 +10965,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet p1008"
--      Attribute "NickName" "" "HP LaserJet p1008, $Version"
-+      Attribute "NickName" "" "HP LaserJet p1008, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet p1008"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1008;DES:hp laserjet p1008;"
-       PCFileName "hp-laserjet_p1008.ppd"
-@@ -10973,7 +10973,7 @@ Manufacturer "HP"
-     }
-     {
-       ModelName "HP LaserJet p1009"
--      Attribute "NickName" "" "HP LaserJet p1009, $Version"
-+      Attribute "NickName" "" "HP LaserJet p1009, $Version, requires proprietary plugin"
-       Attribute "ShortNickName" "" "HP LaserJet p1009"
-       Attribute "1284DeviceID" "" "MFG:HP;MDL:hp laserjet p1009;DES:hp laserjet p1009;"
-       PCFileName "hp-laserjet_p1009.ppd"
diff --git a/hplip.spec b/hplip.spec
index 773e4f8..e2303b7 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.9.10
-Release: 5%{?dist}
+Version: 3.9.12
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -19,7 +19,6 @@ Patch4: hplip-no-asm.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
 Patch14: hplip-hpcups-sigpipe.patch
-Patch15: hplip-hpcups-plugin.patch
 Patch16: hplip-bad-low-ink-warning.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -127,10 +126,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Avoid busy loop in hpcups when backend has exited (bug #525944).
 %patch14 -p1 -b .hpcups-sigpipe
 
-# Added 'requires proprietary plugin' to appropriate model names
-# (bug #513283).
-%patch15 -p1 -b .hpcups-plugin
-
 # Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
 %patch16 -p1 -b .bad-low-ink-warning
 
@@ -338,6 +333,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Tue Dec 22 2009 Tim Waugh <twaugh@redhat.com> - 3.9.12-1
+- 3.9.12.  No longer need hpcups-plugin patch.
+
 * Thu Dec 10 2009 Tim Waugh <twaugh@redhat.com> - 3.9.10-5
 - Reverted fix for bug #533462 until bug #541604 is solved.
 
diff --git a/sources b/sources
index 273a455..1c45967 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de2c5e83794efdde10fca8379d2402a3  hplip-3.9.10.tar.gz
+2b0906b4a57b437988829557ca62adfd  hplip-3.9.12.tar.gz
diff --git a/upstream-key.gpg b/upstream-key.gpg
index 52525fc..bccc555 100644
--- a/upstream-key.gpg
+++ b/upstream-key.gpg
@@ -1,30 +1,30 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
 
-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
+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
-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
-28sAnA5Xi4CWi5YNNwvlw1AAS00TpNV6
-=BMWb
+AgAgBQJLJ6bHAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQc9dwzaWQR7n4
+dQCghZgIpxuTC+GhiQIO0dK9wTlbMmoAoOB252fEOvf73v8Ya8qmN1GlmYiXuQIN
+BEsnpscQCACEO/wh+X9Apok41vn+qby5YLvSuXNcub1iVSlsByv+28KQbbvXDNPh
+LP9wdO9DmzfIGwarj0uLtn0h9UWTnEpXSZ0bKJnCYc7GZpUvcNyjIuSs69hK2rLd
+38MSb1hoBaICLjZERUhe+ZGwlx7zvAIghj+ss1udwpc6PcdPNaimp+ck9/+eSpir
+BZsWRDEyYZ8r0Tzh0vCMZG3AJZvm439gsze5ImvAt+xFluYRCHMAkXaYimXAipHd
+Hudqu5B1/KNp3kRc68pDw/kzFSJ4bEdSW/3Qu5gJxb4y9XDTMipyFt1YZrP4sYJN
+EMAjIllnMHqQsK4efdNY/JSk92wEjmN/AAQLB/42X5RSrDQc9k/2RdgbRUQPXAXF
+YRySDMt4XfaQNAYiU2nQ1thxJuLzFLnp8VumzMD4tmsmBNmacVFTAMJyWZrum6eP
+dvyczSBG0e+4t6e2YCGdA8hfxJYNHCEE0i6NI7FCu2OPDqgXKsyViql7vchQAAg3
+N4ILBlcoO86JOCbugj+Yjp8mI2tzw2o3GEZLgHPD+t7ECFmeB6QypH02CXGTsTNQ
+6qt99zr86urV8Ta39Q0A6pVV81fkXaGIg1eLX7LCE5g4lV9D/G6KXYWYju3EBz/t
+eZRyrE3BrKM7MEqVUcgBwjIswBPDfJFW+H6B7Ma9RsT0efJgeruc712Z6cztiEkE
+GBECAAkFAksnpscCGwwACgkQc9dwzaWQR7mkswCcD+QNKEcLN9XmWhlzJfwzjW3N
+JgMAniNROBBXr37dCkmawTcagKSwhiUx
+=2aUQ
 -----END PGP PUBLIC KEY BLOCK-----