diff --git a/hplip-deviceIDs-drv.patch b/hplip-deviceIDs-drv.patch
index 165f957..51642a6 100644
--- a/hplip-deviceIDs-drv.patch
+++ b/hplip-deviceIDs-drv.patch
@@ -1,6 +1,6 @@
-diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv/hpcups.drv.in
---- hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv	2013-04-08 11:59:00.000000000 +0200
-+++ hplip-3.13.4/prnt/drv/hpcups.drv.in	2013-05-10 16:55:10.144943059 +0200
+diff -up hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.7/prnt/drv/hpcups.drv.in
+--- hplip-3.13.7/prnt/drv/hpcups.drv.in.deviceIDs-drv	2013-07-23 07:18:43.000000000 +0200
++++ hplip-3.13.7/prnt/drv/hpcups.drv.in	2013-07-23 12:39:39.023387776 +0200
 @@ -473,7 +473,7 @@ Manufacturer "HP"
        ModelName "HP Officejet v40xi"
        Attribute "NickName" "" "HP Officejet v40xi, hpcups $Version"
@@ -397,7 +397,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-officejet_7400_series.ppd"
        Attribute "Product" "" "(HP Officejet 7408 All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet 7410 All-in-one Printer)"
-@@ -10154,7 +10154,7 @@ Manufacturer "HP"
+@@ -10604,7 +10604,7 @@ Manufacturer "HP"
        ModelName "HP PSC 1100 Series"
        Attribute "NickName" "" "HP PSC 1100 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP PSC 1100 Series"
@@ -406,7 +406,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-psc_1100_series.ppd"
        Attribute "Product" "" "(HP PSC 1110 All-in-one Printer)"
        Attribute "Product" "" "(HP PSC 1110v All-in-one Printer)"
-@@ -10164,7 +10164,7 @@ Manufacturer "HP"
+@@ -10614,7 +10614,7 @@ Manufacturer "HP"
        ModelName "HP PSC 1200 Series"
        Attribute "NickName" "" "HP PSC 1200 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP PSC 1200 Series"
@@ -415,7 +415,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-psc_1200_series.ppd"
        Attribute "Product" "" "(HP PSC 1200 All-in-one Printer)"
        Attribute "Product" "" "(HP PSC 1205 All-in-one Printer)"
-@@ -10347,7 +10347,7 @@ Manufacturer "HP"
+@@ -10797,7 +10797,7 @@ Manufacturer "HP"
        ModelName "HP Deskjet 3940"
        Attribute "NickName" "" "HP Deskjet 3940, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 3940"
@@ -424,7 +424,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-deskjet_3940.ppd"
        Attribute "Product" "" "(HP Deskjet 3940 Color Inkjet Printer)"
        Attribute "Product" "" "(HP Deskjet 3940v Color Inkjet Printer)"
-@@ -10356,7 +10356,7 @@ Manufacturer "HP"
+@@ -10806,7 +10806,7 @@ Manufacturer "HP"
        ModelName "HP Officejet 4100 Series"
        Attribute "NickName" "" "HP Officejet 4100 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet 4100 Series"
@@ -433,7 +433,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-officejet_4100_series.ppd"
        Attribute "Product" "" "(HP Officejet 4100 Series All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet 4110xi All-in-one Printer)"
-@@ -10383,7 +10383,7 @@ Manufacturer "HP"
+@@ -10833,7 +10833,7 @@ Manufacturer "HP"
        ModelName "HP Officejet 4300 Series"
        Attribute "NickName" "" "HP Officejet 4300 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet 4300 Series"
@@ -442,7 +442,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-officejet_4300_series.ppd"
        Attribute "Product" "" "(HP Officejet 4308 All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet 4311 All-in-one Printer)"
-@@ -10699,7 +10699,7 @@ Manufacturer "HP"
+@@ -11149,7 +11149,7 @@ Manufacturer "HP"
        ModelName "HP Officejet j3600 Series"
        Attribute "NickName" "" "HP Officejet j3600 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet j3600 Series"
@@ -451,7 +451,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-officejet_j3600_series.ppd"
        Attribute "Product" "" "(HP Officejet j3608 All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet j3625 All-in-one Printer)"
-@@ -10770,7 +10770,7 @@ Manufacturer "HP"
+@@ -11220,7 +11220,7 @@ Manufacturer "HP"
        ModelName "HP Officejet 4200 Series"
        Attribute "NickName" "" "HP Officejet 4200 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet 4200 Series"
@@ -460,7 +460,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-officejet_4200_series.ppd"
        Attribute "Product" "" "(HP Officejet 4200 All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet 4211 All-in-one Printer)"
-@@ -11277,6 +11277,7 @@ Manufacturer "HP"
+@@ -11727,6 +11727,7 @@ Manufacturer "HP"
        Attribute "NickName" "" "HP Photosmart 380 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP Photosmart 380 Series"
        Attribute "1284DeviceID" "" "MFG:HP;MDL:photosmart 380 series;DES:photosmart 380 series;"
@@ -468,7 +468,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-photosmart_380_series.ppd"
        Attribute "Product" "" "(HP Photosmart 385 Compact Photo Printer)"
        Attribute "Product" "" "(HP Photosmart 385xi Compact Photo Printer)"
-@@ -11703,7 +11704,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12153,7 +12154,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 4 Plus"
        Attribute "NickName" "" "HP LaserJet 4 Plus pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 4 Plus"
@@ -477,7 +477,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_4_plus-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 4 Plus Printer)"
        Attribute "Product" "" "(HP LaserJet 4m Plus Printer)"
-@@ -11729,7 +11730,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12179,7 +12180,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 5l"
        Attribute "NickName" "" "HP LaserJet 5l, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 5l"
@@ -486,7 +486,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_5l.ppd"
        Attribute "Product" "" "(HP LaserJet 5l Printer)"
        Attribute "Product" "" "(HP LaserJet 5l-fs Printer)"
-@@ -11739,7 +11740,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12189,7 +12190,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 5mp"
        Attribute "NickName" "" "HP LaserJet 5mp pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 5mp"
@@ -495,7 +495,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_5mp-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 5mp Printer)"
      }
-@@ -11747,7 +11748,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12197,7 +12198,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 5p"
        Attribute "NickName" "" "HP LaserJet 5p, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 5p"
@@ -504,7 +504,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_5p.ppd"
        Attribute "Product" "" "(HP LaserJet 5p Printer)"
      }
-@@ -11755,7 +11756,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12205,7 +12206,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 6l"
        Attribute "NickName" "" "HP LaserJet 6l, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 6l"
@@ -513,7 +513,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_6l.ppd"
        Attribute "Product" "" "(HP LaserJet 6l Printer)"
        Attribute "Product" "" "(HP LaserJet 6lse Printer)"
-@@ -11767,7 +11768,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12217,7 +12218,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 6p"
        Attribute "NickName" "" "HP LaserJet 6p, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 6p"
@@ -522,7 +522,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_6p.ppd"
        Attribute "Product" "" "(HP LaserJet 6p Printer)"
      }
-@@ -11775,7 +11776,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12225,7 +12226,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 6mp"
        Attribute "NickName" "" "HP LaserJet 6mp pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 6mp"
@@ -531,7 +531,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_6mp-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 6mp Printer)"
        Attribute "Product" "" "(HP LaserJet 6mp Se Printer)"
-@@ -11785,7 +11786,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12235,7 +12236,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1015"
        Attribute "NickName" "" "HP LaserJet 1015, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1015"
@@ -540,7 +540,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_1015.ppd"
        Attribute "Product" "" "(HP LaserJet 1015 Printer)"
      }
-@@ -11835,7 +11836,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12285,7 +12286,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1100"
        Attribute "NickName" "" "HP LaserJet 1100, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1100"
@@ -549,7 +549,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_1100.ppd"
        Attribute "Product" "" "(HP LaserJet 1100 Printer)"
        Attribute "Product" "" "(HP LaserJet 1100se Printer)"
-@@ -11845,7 +11846,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12295,7 +12296,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1150"
        Attribute "NickName" "" "HP LaserJet 1150, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1150"
@@ -558,7 +558,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_1150.ppd"
        Attribute "Product" "" "(HP LaserJet 1150 Printer)"
      }
-@@ -11862,7 +11863,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12312,7 +12313,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1160 Series"
        Attribute "NickName" "" "HP LaserJet 1160 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1160 Series"
@@ -567,7 +567,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_1160_series.ppd"
        Attribute "Product" "" "(HP LaserJet 1160 Series Printer)"
      }
-@@ -11870,7 +11871,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12320,7 +12321,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1200"
        Attribute "NickName" "" "HP LaserJet 1200 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1200"
@@ -576,7 +576,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_1200-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 1200 Printer)"
        Attribute "Product" "" "(HP LaserJet 1200se Printer)"
-@@ -11895,7 +11896,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12345,7 +12346,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1220"
        Attribute "NickName" "" "HP LaserJet 1220 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1220"
@@ -585,7 +585,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_1220-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 1220 All-in-one Printer)"
      }
-@@ -11903,7 +11904,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12353,7 +12354,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1300"
        Attribute "NickName" "" "HP LaserJet 1300 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1300"
@@ -594,7 +594,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_1300-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 1300 Printer)"
        Attribute "Product" "" "(HP LaserJet 1300t Printer)"
-@@ -11928,7 +11929,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12378,7 +12379,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1320 Series"
        Attribute "NickName" "" "HP LaserJet 1320 Series pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1320 Series"
@@ -603,7 +603,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_1320_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 1320 Series Printer)"
      }
-@@ -11952,7 +11953,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12402,7 +12403,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1320"
        Attribute "NickName" "" "HP LaserJet 1320, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1320"
@@ -612,7 +612,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_1320.ppd"
        Attribute "Product" "" "(HP LaserJet 1320 Printer)"
        Attribute "Product" "" "(HP LaserJet 1320t Printer)"
-@@ -11977,7 +11978,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12427,7 +12428,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet m1522nf MFP"
        Attribute "NickName" "" "HP LaserJet m1522nf MFP pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet m1522nf MFP"
@@ -621,7 +621,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_m1522nf_mfp-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet m1522nf Multifunction Printer)"
      }
-@@ -12049,7 +12050,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12499,7 +12500,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet p2015 Series"
        Attribute "NickName" "" "HP LaserJet p2015 Series pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet p2015 Series"
@@ -630,7 +630,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_p2015_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet p2015 Printer)"
      }
-@@ -12073,7 +12074,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12523,7 +12524,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet p2035"
        Attribute "NickName" "" "HP LaserJet p2035 pcl3, hpcups $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LaserJet p2035"
@@ -639,7 +639,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_p2035-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet p2035 Printer)"
      }
-@@ -12113,7 +12114,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12563,7 +12564,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 2100"
        Attribute "NickName" "" "HP LaserJet 2100, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 2100"
@@ -648,7 +648,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_2100.ppd"
        Attribute "Product" "" "(HP LaserJet 2100 Printer)"
        Attribute "Product" "" "(HP LaserJet 2100m Printer)"
-@@ -12125,7 +12126,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12575,7 +12576,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 2100 Series"
        Attribute "NickName" "" "HP LaserJet 2100 Series pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 2100 Series"
@@ -657,7 +657,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_2100_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 2100 Series Printer)"
      }
-@@ -12133,7 +12134,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12583,7 +12584,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 2200 Series"
        Attribute "NickName" "" "HP LaserJet 2200 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 2200 Series"
@@ -666,7 +666,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_2200_series.ppd"
        Attribute "Product" "" "(HP LaserJet 2200 Series Printer)"
      }
-@@ -12141,7 +12142,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12591,7 +12592,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 2200"
        Attribute "NickName" "" "HP LaserJet 2200 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 2200"
@@ -675,7 +675,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_2200-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 2200 Printer)"
        Attribute "Product" "" "(HP LaserJet 2200d Printer)"
-@@ -12154,7 +12155,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12604,7 +12605,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 2300"
        Attribute "NickName" "" "HP LaserJet 2300 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 2300"
@@ -684,7 +684,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_2300-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 2300 Printer)"
        Attribute "Product" "" "(HP LaserJet 2300n Printer)"
-@@ -12167,7 +12168,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12617,7 +12618,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 2300 Series"
        Attribute "NickName" "" "HP LaserJet 2300 Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 2300 Series"
@@ -693,7 +693,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_2300_series.ppd"
        Attribute "Product" "" "(HP LaserJet 2300 Series Printer)"
      }
-@@ -12183,7 +12184,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12633,7 +12634,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 2420"
        Attribute "NickName" "" "HP LaserJet 2420 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 2420"
@@ -702,7 +702,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_2420-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 2420 Printer)"
        Attribute "Product" "" "(HP LaserJet 2420d Printer)"
-@@ -12194,7 +12195,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12644,7 +12645,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 2430"
        Attribute "NickName" "" "HP LaserJet 2430 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 2430"
@@ -711,7 +711,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_2430-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 2430t Printer)"
        Attribute "Product" "" "(HP LaserJet 2430 Printer)"
-@@ -12222,7 +12223,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12672,7 +12673,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet p3005"
        Attribute "NickName" "" "HP LaserJet p3005 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet p3005"
@@ -720,7 +720,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_p3005-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet p3005 Printer)"
        Attribute "Product" "" "(HP LaserJet p3005d Printer)"
-@@ -12235,7 +12236,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12685,7 +12686,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet p3010 Series"
        Attribute "NickName" "" "HP LaserJet p3010 Series pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet p3010 Series"
@@ -729,7 +729,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_p3010_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet p3015 Printer)"
        Attribute "Product" "" "(HP LaserJet p3011 Printer)"
-@@ -12244,7 +12245,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12694,7 +12695,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3015"
        Attribute "NickName" "" "HP LaserJet 3015 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3015"
@@ -738,7 +738,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_3015-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 3015 All-in-one Printer)"
      }
-@@ -12252,7 +12253,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12702,7 +12703,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3020"
        Attribute "NickName" "" "HP LaserJet 3020 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3020"
@@ -747,7 +747,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_3020-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 3020 All-in-one Printer)"
      }
-@@ -12260,7 +12261,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12710,7 +12711,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet m3027 MFP"
        Attribute "NickName" "" "HP LaserJet m3027 MFP pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet m3027 MFP"
@@ -756,7 +756,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_m3027_mfp-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet m3027 Multifunction Printer)"
        Attribute "Product" "" "(HP LaserJet m3027x Multifunction Printer)"
-@@ -12269,7 +12270,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12719,7 +12720,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3030"
        Attribute "NickName" "" "HP LaserJet 3030 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3030"
@@ -765,7 +765,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_3030-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 3030 All-in-one Printer)"
      }
-@@ -12277,7 +12278,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12727,7 +12728,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3050"
        Attribute "NickName" "" "HP LaserJet 3050 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3050"
@@ -774,7 +774,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_3050-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 3050 All-in-one Printer)"
        Attribute "Product" "" "(HP LaserJet 3050z All-in-one Printer)"
-@@ -12286,7 +12287,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12736,7 +12737,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3052"
        Attribute "NickName" "" "HP LaserJet 3052 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3052"
@@ -783,7 +783,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_3052-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 3052 All-in-one Printer)"
      }
-@@ -12294,7 +12295,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12744,7 +12745,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3055"
        Attribute "NickName" "" "HP LaserJet 3055, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3055"
@@ -792,7 +792,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_3055.ppd"
        Attribute "Product" "" "(HP LaserJet 3055 All-in-one Printer)"
      }
-@@ -12322,7 +12323,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12772,7 +12773,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3200m"
        Attribute "NickName" "" "HP LaserJet 3200m pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3200m"
@@ -801,7 +801,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_3200m-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 3200m All-in-one Printer)"
      }
-@@ -12338,7 +12339,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12788,7 +12789,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3200"
        Attribute "NickName" "" "HP LaserJet 3200, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3200"
@@ -810,7 +810,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_3200.ppd"
        Attribute "Product" "" "(HP LaserJet 3200 All-in-one Printer)"
      }
-@@ -12358,7 +12359,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12808,7 +12809,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3330"
        Attribute "NickName" "" "HP LaserJet 3330, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3330"
@@ -819,7 +819,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_3330.ppd"
        Attribute "Product" "" "(HP LaserJet 3330 Multifunction Printer)"
      }
-@@ -12366,7 +12367,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12816,7 +12817,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3380"
        Attribute "NickName" "" "HP LaserJet 3380 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3380"
@@ -828,7 +828,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_3380-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 3380 All-in-one Printer)"
      }
-@@ -12374,7 +12375,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12824,7 +12825,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 3390"
        Attribute "NickName" "" "HP LaserJet 3390 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 3390"
@@ -837,7 +837,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_3390-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 3390 All-in-one Printer)"
      }
-@@ -12390,7 +12391,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12840,7 +12841,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 4000 Series"
        Attribute "NickName" "" "HP LaserJet 4000 Series pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 4000 Series"
@@ -846,7 +846,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_4000_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 4000 Printer)"
        Attribute "Product" "" "(HP LaserJet 4000n Printer)"
-@@ -12410,7 +12411,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12860,7 +12861,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet p4014"
        Attribute "NickName" "" "HP LaserJet p4014, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet p4014"
@@ -855,7 +855,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_p4014.ppd"
        Attribute "Product" "" "(HP LaserJet p4014 Printer)"
      }
-@@ -12466,7 +12467,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12916,7 +12917,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 4050 Series"
        Attribute "NickName" "" "HP LaserJet 4050 Series pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 4050 Series"
@@ -864,7 +864,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_4050_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 4050 Printer)"
        Attribute "Product" "" "(HP LaserJet 4050n Printer)"
-@@ -12487,7 +12488,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12937,7 +12938,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 4100 Series"
        Attribute "NickName" "" "HP LaserJet 4100 Series pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 4100 Series"
@@ -873,7 +873,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_4100_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 410dtn Printer)"
        Attribute "Product" "" "(HP LaserJet 4100tn Printer)"
-@@ -12506,7 +12507,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12956,7 +12957,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 4200"
        Attribute "NickName" "" "HP LaserJet 4200 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 4200"
@@ -882,7 +882,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_4200-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 4200 Printer)"
        Attribute "Product" "" "(HP LaserJet 4200l Printer)"
-@@ -12531,7 +12532,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12981,7 +12982,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 4250"
        Attribute "NickName" "" "HP LaserJet 4250 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 4250"
@@ -891,7 +891,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_4250-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 4250 Printer)"
        Attribute "Product" "" "(HP LaserJet 4250dtn Printer)"
-@@ -12543,7 +12544,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -12993,7 +12994,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 4300"
        Attribute "NickName" "" "HP LaserJet 4300 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 4300"
@@ -900,7 +900,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_4300-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 4300 Printer)"
        Attribute "Product" "" "(HP LaserJet 4300dtn Printer)"
-@@ -12556,7 +12557,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13006,7 +13007,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 4345 MFP"
        Attribute "NickName" "" "HP LaserJet 4345 MFP pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 4345 MFP"
@@ -909,7 +909,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_4345_mfp-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 4345 Multifunction Printer)"
        Attribute "Product" "" "(HP LaserJet 4345x Multifunction Printer)"
-@@ -12567,7 +12568,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13017,7 +13018,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet m4345 MFP"
        Attribute "NickName" "" "HP LaserJet m4345 MFP pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet m4345 MFP"
@@ -918,7 +918,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_m4345_mfp-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet m4345 Multifunction Printer)"
        Attribute "Product" "" "(HP LaserJet m4345x Multifunction Printer)"
-@@ -12586,7 +12587,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13036,7 +13037,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 4350"
        Attribute "NickName" "" "HP LaserJet 4350 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 4350"
@@ -927,7 +927,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_4350-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 4350 Printer)"
        Attribute "Product" "" "(HP LaserJet 4350dtn Printer)"
-@@ -12622,7 +12623,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13072,7 +13073,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet p4515"
        Attribute "NickName" "" "HP LaserJet p4515, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet p4515"
@@ -936,7 +936,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_p4515.ppd"
        Attribute "Product" "" "(HP LaserJet p4515 Printer)"
      }
-@@ -12638,7 +12639,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13088,7 +13089,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 5000 Series"
        Attribute "NickName" "" "HP LaserJet 5000 Series pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 5000 Series"
@@ -945,7 +945,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_5000_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 5000 Series Printer)"
      }
-@@ -12654,7 +12655,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13104,7 +13105,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 8000 Series"
        Attribute "NickName" "" "HP LaserJet 8000 Series pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 8000 Series"
@@ -954,7 +954,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_8000_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 8000 Series Printer)"
      }
-@@ -12748,7 +12749,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13198,7 +13199,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 5si"
        Attribute "NickName" "" "HP LaserJet 5si pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 5si"
@@ -963,7 +963,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_5si-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 5si Printer)"
        Attribute "Product" "" "(HP LaserJet 5si Hm Printer)"
-@@ -12784,7 +12785,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13234,7 +13235,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet m3035 MFP"
        Attribute "NickName" "" "HP LaserJet m3035 MFP pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet m3035 MFP"
@@ -972,7 +972,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_m3035_mfp-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet m3035 Multifunction Printer)"
        Attribute "Product" "" "(HP LaserJet m3035xs Multifunction Printer)"
-@@ -12805,7 +12806,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13255,7 +13256,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet m5025 MFP"
        Attribute "NickName" "" "HP LaserJet m5025 MFP pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet m5025 MFP"
@@ -981,7 +981,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_m5025_mfp-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet m5025 Multifunction Printer)"
      }
-@@ -12813,7 +12814,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13263,7 +13264,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet m5035 MFP"
        Attribute "NickName" "" "HP LaserJet m5035 MFP pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet m5035 MFP"
@@ -990,7 +990,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_m5035_mfp-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet m5035 Multifunction Printer)"
        Attribute "Product" "" "(HP LaserJet m5035x Multifunction Printer)"
-@@ -12831,7 +12832,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13281,7 +13282,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 5100 Series"
        Attribute "NickName" "" "HP LaserJet 5100 Series pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 5100 Series"
@@ -999,7 +999,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_5100_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 5100 Printer)"
        Attribute "Product" "" "(HP LaserJet 5100le Printer)"
-@@ -12862,7 +12863,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13312,7 +13313,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 8000"
        Attribute "NickName" "" "HP LaserJet 8000, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 8000"
@@ -1008,7 +1008,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_8000.ppd"
        Attribute "Product" "" "(HP LaserJet 8000 Printer)"
        Attribute "Product" "" "(HP LaserJet 8000dn Printer)"
-@@ -12882,7 +12883,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13332,7 +13333,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 8150 Series"
        Attribute "NickName" "" "HP LaserJet 8150 Series pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 8150 Series"
@@ -1017,7 +1017,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_8150_series-pcl3.ppd"
        Attribute "Product" "" "(HP LaserJet 8150 Printer)"
        Attribute "Product" "" "(HP LaserJet 8150n Printer)"
-@@ -13086,7 +13087,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13536,7 +13537,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Color LaserJet cm1312nfi MFP"
            Attribute "NickName" "" "HP Color LaserJet cm1312nfi MFP pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Color LaserJet cm1312nfi MFP"
@@ -1026,7 +1026,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
            PCFileName "hp-color_laserjet_cm1312nfi_mfp-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet cm1312nfi Multifunction Printer)"
          }
-@@ -13174,7 +13175,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13624,7 +13625,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Color LaserJet cp1515n"
            Attribute "NickName" "" "HP Color LaserJet cp1515n pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Color LaserJet cp1515n"
@@ -1035,7 +1035,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
            PCFileName "hp-color_laserjet_cp1515n-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet cp1515n Printer)"
          }
-@@ -13182,7 +13183,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13632,7 +13633,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Color LaserJet cp1518ni"
            Attribute "NickName" "" "HP Color LaserJet cp1518ni pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Color LaserJet cp1518ni"
@@ -1044,7 +1044,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
            PCFileName "hp-color_laserjet_cp1518ni-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet cp1518ni Printer)"
          }
-@@ -13190,7 +13191,9 @@ Group "RLT/HP Real Life Technologies"
+@@ -13640,7 +13641,9 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Color LaserJet cp2025dn"
            Attribute "NickName" "" "HP Color LaserJet cp2025dn pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Color LaserJet cp2025dn"
@@ -1055,7 +1055,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
            PCFileName "hp-color_laserjet_cp2025dn-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet cp2025dn Printer)"
          }
-@@ -13206,7 +13209,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13656,7 +13659,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Color LaserJet cp2025n"
            Attribute "NickName" "" "HP Color LaserJet cp2025n pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Color LaserJet cp2025n"
@@ -1064,7 +1064,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
            PCFileName "hp-color_laserjet_cp2025n-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet cp2025n Printer)"
          }
-@@ -13222,7 +13225,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13672,7 +13675,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Business Inkjet 2300"
            Attribute "NickName" "" "HP Business Inkjet 2300 pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Business Inkjet 2300"
@@ -1073,7 +1073,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
            PCFileName "hp-business_inkjet_2300-pcl3.ppd"
            Attribute "Product" "" "(HP Business Inkjet 2300 Printer)"
            Attribute "Product" "" "(HP Business Inkjet 2300n Printer)"
-@@ -13232,7 +13235,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13682,7 +13685,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Color LaserJet 2500"
            Attribute "NickName" "" "HP Color LaserJet 2500 pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Color LaserJet 2500"
@@ -1082,7 +1082,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
            PCFileName "hp-color_laserjet_2500-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet 2500 Printer)"
          }
-@@ -13273,7 +13276,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13723,7 +13726,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Color LaserJet cp3525"
            Attribute "NickName" "" "HP Color LaserJet cp3525 pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Color LaserJet cp3525"
@@ -1091,7 +1091,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
            PCFileName "hp-color_laserjet_cp3525-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet cp3525 Printer)"
            Attribute "Product" "" "(HP Color LaserJet cp3525n Printer)"
-@@ -13284,7 +13287,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13734,7 +13737,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Color LaserJet cm3530 MFP"
            Attribute "NickName" "" "HP Color LaserJet cm3530 MFP pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Color LaserJet cm3530 MFP"
@@ -1100,7 +1100,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
            PCFileName "hp-color_laserjet_cm3530_mfp-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet cm3530 Multifunction Printer)"
            Attribute "Product" "" "(HP Color LaserJet cm3530fs Multifunction Printer)"
-@@ -13293,7 +13296,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13743,7 +13746,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Color LaserJet 3700"
            Attribute "NickName" "" "HP Color LaserJet 3700 pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Color LaserJet 3700"
@@ -1109,7 +1109,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
            PCFileName "hp-color_laserjet_3700-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet 3700 Printer)"
          }
-@@ -13312,7 +13315,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13762,7 +13765,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Color LaserJet 3800"
            Attribute "NickName" "" "HP Color LaserJet 3800 pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Color LaserJet 3800"
@@ -1118,7 +1118,16 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
            PCFileName "hp-color_laserjet_3800-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet 3800 Printer)"
            Attribute "Product" "" "(HP Color LaserJet 3800n Printer)"
-@@ -13351,7 +13354,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13773,7 +13776,7 @@ Group "RLT/HP Real Life Technologies"
+           ModelName "HP Color LaserJet cp4005"
+           Attribute "NickName" "" "HP Color LaserJet cp4005 pcl3, hpcups $Version"
+           Attribute "ShortNickName" "" "HP Color LaserJet cp4005"
+-          Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cp4005;DES:hp color laserjet cp4005;"
++          Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp color laserjet cp4005;DES:hp color laserjet cp4005;"
+           PCFileName "hp-color_laserjet_cp4005-pcl3.ppd"
+           Attribute "Product" "" "(HP Color LaserJet cp4005n Printer)"
+           Attribute "Product" "" "(HP Color LaserJet cp4005dn Printer)"
+@@ -13801,7 +13804,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Color LaserJet cp4520 Series"
            Attribute "NickName" "" "HP Color LaserJet cp4520 Series pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Color LaserJet cp4520 Series"
@@ -1127,7 +1136,16 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
            PCFileName "hp-color_laserjet_cp4520_series-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet cp4520 Series Printer)"
          }
-@@ -13367,7 +13370,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13809,7 +13812,7 @@ Group "RLT/HP Real Life Technologies"
+           ModelName "HP Color LaserJet cm4540 MFP"
+           Attribute "NickName" "" "HP Color LaserJet cm4540 MFP pcl3, hpcups $Version"
+           Attribute "ShortNickName" "" "HP Color LaserJet cm4540 MFP"
+-          Attribute "1284DeviceID" "" "MFG:HP;MDL:hp color laserjet cm4540 mfp;DES:hp color laserjet cm4540 mfp;"
++          Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4540 MFP;DES:HP Color LaserJet CM4540 MFP;"
+           PCFileName "hp-color_laserjet_cm4540_mfp-pcl3.ppd"
+           Attribute "Product" "" "(HP Color LaserJet cm4540 Multifunction Printer)"
+         }
+@@ -13817,7 +13820,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Color LaserJet 4550"
            Attribute "NickName" "" "HP Color LaserJet 4550 pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Color LaserJet 4550"
@@ -1136,7 +1154,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
            PCFileName "hp-color_laserjet_4550-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet 4550 Printer)"
            Attribute "Product" "" "(HP Color LaserJet 4550n Printer)"
-@@ -13380,7 +13383,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13830,7 +13833,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Color LaserJet 4600 Series"
            Attribute "NickName" "" "HP Color LaserJet 4600 Series, hpcups $Version"
            Attribute "ShortNickName" "" "HP Color LaserJet 4600 Series"
@@ -1145,7 +1163,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
            PCFileName "hp-color_laserjet_4600_series.ppd"
            Attribute "Product" "" "(HP Color LaserJet 4600 Printer)"
            Attribute "Product" "" "(HP Color LaserJet 4600dn Printer)"
-@@ -13392,7 +13395,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13842,7 +13845,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Color LaserJet 4600"
            Attribute "NickName" "" "HP Color LaserJet 4600 pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Color LaserJet 4600"
@@ -1154,7 +1172,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
            PCFileName "hp-color_laserjet_4600-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet 4600 Series Printer)"
          }
-@@ -13408,7 +13411,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13858,7 +13861,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Color LaserJet 4650"
            Attribute "NickName" "" "HP Color LaserJet 4650 pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Color LaserJet 4650"
@@ -1163,7 +1181,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
            PCFileName "hp-color_laserjet_4650-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet 4650 Printer)"
            Attribute "Product" "" "(HP Color LaserJet 4650n Printer)"
-@@ -13420,7 +13423,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13870,7 +13873,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Color LaserJet 4700"
            Attribute "NickName" "" "HP Color LaserJet 4700 pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Color LaserJet 4700"
@@ -1172,7 +1190,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
            PCFileName "hp-color_laserjet_4700-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet 4700 Printer)"
            Attribute "Product" "" "(HP Color LaserJet 4700dn Printer)"
-@@ -13432,7 +13435,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13882,7 +13885,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Color LaserJet cm4730 MFP"
            Attribute "NickName" "" "HP Color LaserJet cm4730 MFP pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Color LaserJet cm4730 MFP"
@@ -1181,7 +1199,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
            PCFileName "hp-color_laserjet_cm4730_mfp-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet cm4730 Multifunction Printer)"
            Attribute "Product" "" "(HP Color LaserJet cm4730f Multifunction Printer)"
-@@ -13486,7 +13489,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13936,7 +13939,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Officejet 9100 Series"
            Attribute "NickName" "" "HP Officejet 9100 Series pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Officejet 9100 Series"
@@ -1190,7 +1208,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
            PCFileName "hp-officejet_9100_series-pcl3.ppd"
            Attribute "Product" "" "(HP Officejet 9110 All-in-one Printer)"
            Attribute "Product" "" "(HP Officejet 9120 All-in-one Printer)"
-@@ -13514,7 +13517,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -13964,7 +13967,7 @@ Group "RLT/HP Real Life Technologies"
            ModelName "HP Color LaserJet cm2320nf MFP"
            Attribute "NickName" "" "HP Color LaserJet cm2320nf MFP pcl3, hpcups $Version"
            Attribute "ShortNickName" "" "HP Color LaserJet cm2320nf MFP"
@@ -1199,7 +1217,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
            PCFileName "hp-color_laserjet_cm2320nf_mfp-pcl3.ppd"
            Attribute "Product" "" "(HP Color LaserJet cm2320nf Multifunction Printer)"
          }
-@@ -13570,7 +13573,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14020,7 +14023,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Business Inkjet 2800"
        Attribute "NickName" "" "HP Business Inkjet 2800 pcl3, hpcups $Version"
        Attribute "ShortNickName" "" "HP Business Inkjet 2800"
@@ -1208,7 +1226,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-business_inkjet_2800-pcl3.ppd"
        Attribute "Product" "" "(HP Business Inkjet 2800 Printer)"
        Attribute "Product" "" "(HP Business Inkjet 2800dt Printer)"
-@@ -13605,7 +13608,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14055,7 +14058,7 @@ Group "RLT/HP Real Life Technologies"
          ModelName "HP Color LaserJet 5550"
          Attribute "NickName" "" "HP Color LaserJet 5550 pcl3, hpcups $Version"
          Attribute "ShortNickName" "" "HP Color LaserJet 5550"
@@ -1217,7 +1235,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
          PCFileName "hp-color_laserjet_5550-pcl3.ppd"
          Attribute "Product" "" "(HP Color LaserJet 5550n Printer)"
          Attribute "Product" "" "(HP Color LaserJet 5550 Printer)"
-@@ -13862,7 +13865,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14312,7 +14315,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1010"
        Attribute "NickName" "" "HP LaserJet 1010, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1010"
@@ -1226,7 +1244,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_1010.ppd"
        Attribute "Product" "" "(HP LaserJet 1010 Printer)"
      }
-@@ -13870,7 +13873,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14320,7 +14323,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1012"
        Attribute "NickName" "" "HP LaserJet 1012, hpcups $Version"
        Attribute "ShortNickName" "" "HP LaserJet 1012"
@@ -1235,7 +1253,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_1012.ppd"
        Attribute "Product" "" "(HP LaserJet 1012 Printer)"
      }
-@@ -14078,7 +14081,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14528,7 +14531,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet Lx"
        Attribute "NickName" "" "HP Officejet Lx, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet Lx"
@@ -1244,7 +1262,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-officejet_lx.ppd"
        Attribute "Product" "" "(HP Officejet Lx All-in-one Printer)"
      }
-@@ -14242,7 +14245,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14692,7 +14695,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet Series 300"
        Attribute "NickName" "" "HP Officejet Series 300, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet Series 300"
@@ -1253,7 +1271,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-officejet_series_300.ppd"
        Attribute "Product" "" "(HP Officejet 300 All-in-one Printer)"
      }
-@@ -14266,7 +14269,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14716,7 +14719,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 400"
        Attribute "NickName" "" "HP Deskjet 400, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 400"
@@ -1262,7 +1280,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-deskjet_400.ppd"
        Attribute "Product" "" "(HP Deskjet 400 Printer)"
        Attribute "Product" "" "(HP Deskjet 400 Color Capable Printer)"
-@@ -14283,7 +14286,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14733,7 +14736,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 540"
        Attribute "NickName" "" "HP Deskjet 540, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 540"
@@ -1271,7 +1289,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-deskjet_540.ppd"
        Attribute "Product" "" "(HP Deskjet 540 Printer)"
      }
-@@ -14408,7 +14411,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14858,7 +14861,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 630c"
        Attribute "NickName" "" "HP Deskjet 630c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 630c"
@@ -1280,7 +1298,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-deskjet_630c.ppd"
        Attribute "Product" "" "(HP Deskjet 630c Printer)"
      }
-@@ -14424,7 +14427,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14874,7 +14877,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 656c"
        Attribute "NickName" "" "HP Deskjet 656c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 656c"
@@ -1289,7 +1307,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-deskjet_656c.ppd"
        Attribute "Product" "" "(HP Deskjet 656c Printer)"
        Attribute "Product" "" "(HP Deskjet 656cvr Printer)"
-@@ -14537,7 +14540,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -14987,7 +14990,7 @@ Group "RLT/HP Real Life Technologies"
          ModelName "HP Deskjet 600"
          Attribute "NickName" "" "HP Deskjet 600, hpcups $Version"
          Attribute "ShortNickName" "" "HP Deskjet 600"
@@ -1298,7 +1316,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
          PCFileName "hp-deskjet_600.ppd"
          Attribute "Product" "" "(HP Deskjet 600c Printer)"
          Attribute "Product" "" "(HP Deskjet 600 Printer)"
-@@ -14591,7 +14594,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15041,7 +15044,7 @@ Group "RLT/HP Real Life Technologies"
          ModelName "HP Officejet Series 600"
          Attribute "NickName" "" "HP Officejet Series 600, hpcups $Version"
          Attribute "ShortNickName" "" "HP Officejet Series 600"
@@ -1307,7 +1325,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
          PCFileName "hp-officejet_series_600.ppd"
          Attribute "Product" "" "(HP Officejet 600 All-in-one Printer)"
        }
-@@ -14643,7 +14646,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15093,7 +15096,7 @@ Group "RLT/HP Real Life Technologies"
          ModelName "HP Deskjet 670c"
          Attribute "NickName" "" "HP Deskjet 670c, hpcups $Version"
          Attribute "ShortNickName" "" "HP Deskjet 670c"
@@ -1316,7 +1334,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
          PCFileName "hp-deskjet_670c.ppd"
          Attribute "Product" "" "(HP Deskjet 670c)"
        }
-@@ -14795,7 +14798,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15245,7 +15248,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 610c"
        Attribute "NickName" "" "HP Deskjet 610c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 610c"
@@ -1325,7 +1343,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-deskjet_610c.ppd"
        Attribute "Product" "" "(HP Deskjet 610c Printer)"
      }
-@@ -14819,7 +14822,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15269,7 +15272,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 640c"
        Attribute "NickName" "" "HP Deskjet 640c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 640c"
@@ -1334,7 +1352,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-deskjet_640c.ppd"
        Attribute "Product" "" "(HP Deskjet 640c Lite Printer)"
        Attribute "Product" "" "(HP Deskjet 640c Printer)"
-@@ -14839,7 +14842,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15289,7 +15292,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 690c"
        Attribute "NickName" "" "HP Deskjet 690c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 690c"
@@ -1343,7 +1361,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-deskjet_690c.ppd"
        Attribute "Product" "" "(HP Deskjet 690c Plus Printer)"
        Attribute "Product" "" "(HP Deskjet 690c Printer)"
-@@ -14899,7 +14902,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15349,7 +15352,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet Series 700"
        Attribute "NickName" "" "HP Officejet Series 700, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet Series 700"
@@ -1352,7 +1370,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-officejet_series_700.ppd"
        Attribute "Product" "" "(HP Officejet 700 All-in-one Printer)"
      }
-@@ -15042,7 +15045,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15492,7 +15495,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet T Series"
        Attribute "NickName" "" "HP Officejet T Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet T Series"
@@ -1361,7 +1379,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-officejet_t_series.ppd"
        Attribute "Product" "" "(HP Officejet t45 All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet t45xi All-in-one Printer)"
-@@ -15053,7 +15056,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15503,7 +15506,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet r40"
        Attribute "NickName" "" "HP Officejet r40, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet r40"
@@ -1370,7 +1388,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-officejet_r40.ppd"
        Attribute "Product" "" "(HP Officejet r40 All-in-one Printer)"
      }
-@@ -15077,7 +15080,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15527,7 +15530,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet r60"
        Attribute "NickName" "" "HP Officejet r60, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet r60"
@@ -1379,7 +1397,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-officejet_r60.ppd"
        Attribute "Product" "" "(HP Officejet r60 All-in-one Printer)"
      }
-@@ -15085,7 +15088,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15535,7 +15538,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet r65"
        Attribute "NickName" "" "HP Officejet r65, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet r65"
@@ -1388,7 +1406,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-officejet_r65.ppd"
        Attribute "Product" "" "(HP Officejet r65 All-in-one Printer)"
      }
-@@ -15101,7 +15104,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15551,7 +15554,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet r80"
        Attribute "NickName" "" "HP Officejet r80, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet r80"
@@ -1397,7 +1415,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-officejet_r80.ppd"
        Attribute "Product" "" "(HP Officejet r80 All-in-one Printer)"
      }
-@@ -15109,7 +15112,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15559,7 +15562,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP PSC 500"
        Attribute "NickName" "" "HP PSC 500, hpcups $Version"
        Attribute "ShortNickName" "" "HP PSC 500"
@@ -1406,7 +1424,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-psc_500.ppd"
        Attribute "Product" "" "(HP PSC 500 All-in-one Printer)"
        Attribute "Product" "" "(HP PSC 500xi All-in-one Printer)"
-@@ -15126,7 +15129,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15576,7 +15579,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 812c"
        Attribute "NickName" "" "HP Deskjet 812c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 812c"
@@ -1415,7 +1433,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-deskjet_812c.ppd"
        Attribute "Product" "" "(HP Deskjet 812c Printer)"
      }
-@@ -15134,7 +15137,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15584,7 +15587,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 815c"
        Attribute "NickName" "" "HP Deskjet 815c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 815c"
@@ -1424,7 +1442,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-deskjet_815c.ppd"
        Attribute "Product" "" "(HP Deskjet 815c Printer)"
      }
-@@ -15166,7 +15169,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15616,7 +15619,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 840c"
        Attribute "NickName" "" "HP Deskjet 840c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 840c"
@@ -1433,7 +1451,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-deskjet_840c.ppd"
        Attribute "Product" "" "(HP Deskjet 840c Printer)"
      }
-@@ -15174,7 +15177,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15624,7 +15627,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 841c"
        Attribute "NickName" "" "HP Deskjet 841c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 841c"
@@ -1442,7 +1460,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-deskjet_841c.ppd"
        Attribute "Product" "" "(HP Deskjet 841c Printer)"
      }
-@@ -15190,7 +15193,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15640,7 +15643,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 843c"
        Attribute "NickName" "" "HP Deskjet 843c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 843c"
@@ -1451,7 +1469,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-deskjet_843c.ppd"
        Attribute "Product" "" "(HP Deskjet 843c Printer)"
        Attribute "Product" "" "(HP Deskjet 843cxe Printer)"
-@@ -15199,7 +15202,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15649,7 +15652,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 880c"
        Attribute "NickName" "" "HP Deskjet 880c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 880c"
@@ -1460,7 +1478,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-deskjet_880c.ppd"
        Attribute "Product" "" "(HP Deskjet 880c Printer)"
      }
-@@ -15215,7 +15218,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15665,7 +15668,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 895c"
        Attribute "NickName" "" "HP Deskjet 895c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 895c"
@@ -1469,7 +1487,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-deskjet_895c.ppd"
        Attribute "Product" "" "(HP Deskjet 895cse Printer)"
        Attribute "Product" "" "(HP Deskjet 895c Printer)"
-@@ -15332,7 +15335,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15782,7 +15785,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 825c"
        Attribute "NickName" "" "HP Deskjet 825c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 825c"
@@ -1478,7 +1496,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-deskjet_825c.ppd"
        Attribute "Product" "" "(HP Deskjet 825cvr Printer)"
        Attribute "Product" "" "(HP Deskjet 825c Printer)"
-@@ -15341,7 +15344,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15791,7 +15794,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 845c"
        Attribute "NickName" "" "HP Deskjet 845c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 845c"
@@ -1487,7 +1505,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-deskjet_845c.ppd"
        Attribute "Product" "" "(HP Deskjet 845c Printer)"
        Attribute "Product" "" "(HP Deskjet 845cvr Printer)"
-@@ -15452,7 +15455,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15902,7 +15905,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 850c"
        Attribute "NickName" "" "HP Deskjet 850c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 850c"
@@ -1496,7 +1514,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-deskjet_850c.ppd"
        Attribute "Product" "" "(HP Deskjet 850k Printer)"
        Attribute "Product" "" "(HP Deskjet 850c Printer)"
-@@ -15471,7 +15474,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15921,7 +15924,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 870c"
        Attribute "NickName" "" "HP Deskjet 870c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 870c"
@@ -1505,7 +1523,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-deskjet_870c.ppd"
        Attribute "Product" "" "(HP Deskjet 870k Printer)"
        Attribute "Product" "" "(HP Deskjet 870c Printer)"
-@@ -15482,7 +15485,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -15932,7 +15935,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet Pro 1150c"
        Attribute "NickName" "" "HP Officejet Pro 1150c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet Pro 1150c"
@@ -1514,7 +1532,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-officejet_pro_1150c.ppd"
        Attribute "Product" "" "(HP Officejet Pro 1150c All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet Pro 1150cse All-in-one Printer)"
-@@ -15596,7 +15599,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -16046,7 +16049,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Deskjet 890c"
        Attribute "NickName" "" "HP Deskjet 890c, hpcups $Version"
        Attribute "ShortNickName" "" "HP Deskjet 890c"
@@ -1523,7 +1541,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-deskjet_890c.ppd"
        Attribute "Product" "" "(HP Deskjet 890cse Printer)"
        Attribute "Product" "" "(HP Deskjet 890c Printer)"
-@@ -15605,7 +15608,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -16055,7 +16058,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Officejet Pro 1170c Series"
        Attribute "NickName" "" "HP Officejet Pro 1170c Series, hpcups $Version"
        Attribute "ShortNickName" "" "HP Officejet Pro 1170c Series"
@@ -1532,7 +1550,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-officejet_pro_1170c_series.ppd"
        Attribute "Product" "" "(HP Officejet Pro 1170c All-in-one Printer)"
        Attribute "Product" "" "(HP Officejet Pro 1170cse All-in-one Printer)"
-@@ -15747,7 +15750,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -16197,7 +16200,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1018"
        Attribute "NickName" "" "HP LaserJet 1018, hpcups $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LaserJet 1018"
@@ -1541,7 +1559,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_1018.ppd"
        Attribute "Product" "" "(HP LaserJet 1018 Printer)"
        Attribute "Product" "" "(HP LaserJet 1018s Printer)"
-@@ -15756,7 +15759,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -16206,7 +16209,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet 1020"
        Attribute "NickName" "" "HP LaserJet 1020, hpcups $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LaserJet 1020"
@@ -1550,7 +1568,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_1020.ppd"
        Attribute "Product" "" "(HP LaserJet 1020 Printer)"
        Attribute "Product" "" "(HP LaserJet 1020 Plus Printer)"
-@@ -15790,7 +15793,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -16240,7 +16243,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet m1120 MFP"
        Attribute "NickName" "" "HP LaserJet m1120 MFP, hpcups $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LaserJet m1120 MFP"
@@ -1559,7 +1577,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_m1120_mfp.ppd"
        Attribute "Product" "" "(HP LaserJet m1120 Multifunction Printer)"
      }
-@@ -15806,7 +15809,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -16256,7 +16259,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet m1319f MFP"
        Attribute "NickName" "" "HP LaserJet m1319f MFP, hpcups $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LaserJet m1319f MFP"
@@ -1568,7 +1586,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_m1319f_mfp.ppd"
        Attribute "Product" "" "(HP LaserJet m1319f Multifunction Printer)"
      }
-@@ -15822,7 +15825,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -16272,7 +16275,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet p2035"
        Attribute "NickName" "" "HP LaserJet p2035 zjs, hpcups $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LaserJet p2035"
@@ -1577,7 +1595,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_p2035-zjs.ppd"
        Attribute "Product" "" "(HP LaserJet p2035 Printer)"
      }
-@@ -15914,7 +15917,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -16364,7 +16367,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet Professional p1102w"
        Attribute "NickName" "" "HP LaserJet Professional p1102w, hpcups $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LaserJet Professional p1102w"
@@ -1586,7 +1604,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_professional_p1102w.ppd"
        Attribute "Product" "" "(HP LaserJet Professional p1102w Printer)"
      }
-@@ -16044,7 +16047,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -16494,7 +16497,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet Professional m1212nf MFP"
        Attribute "NickName" "" "HP LaserJet Professional m1212nf MFP, hpcups $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LJ Professional m1212nf MFP"
@@ -1595,7 +1613,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_professional_m1212nf_mfp.ppd"
        Attribute "Product" "" "(HP LaserJet Professional m1212nf Multifunction Printer)"
      }
-@@ -16280,7 +16283,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -16730,7 +16733,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet Professional p1606dn"
        Attribute "NickName" "" "HP LaserJet Professional p1606dn, hpcups $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LJ Professional p1606dn"
@@ -1604,7 +1622,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_professional_p1606dn.ppd"
        Attribute "Product" "" "(HP LaserJet Professional p1606dn Printer)"
      }
-@@ -16454,7 +16457,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -16904,7 +16907,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet 2600n"
        Attribute "NickName" "" "HP Color LaserJet 2600n, hpcups $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP Color LaserJet 2600n"
@@ -1613,7 +1631,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-color_laserjet_2600n.ppd"
        Attribute "Product" "" "(HP Color LaserJet 2600n Printer)"
      }
-@@ -16631,7 +16634,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -17081,7 +17084,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet 3500"
        Attribute "NickName" "" "HP Color LaserJet 3500, hpcups $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP Color LaserJet 3500"
@@ -1622,7 +1640,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-color_laserjet_3500.ppd"
        Attribute "Product" "" "(HP Color LaserJet 3500 Printer)"
        Attribute "Product" "" "(HP Color LaserJet 3500dn Printer)"
-@@ -16641,7 +16644,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -17091,7 +17094,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP Color LaserJet 3550"
        Attribute "NickName" "" "HP Color LaserJet 3550, hpcups $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP Color LaserJet 3550"
@@ -1631,7 +1649,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-color_laserjet_3550.ppd"
        Attribute "Product" "" "(HP Color LaserJet 3550 Printer)"
      }
-@@ -16793,7 +16796,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -17243,7 +17246,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet p1505"
        Attribute "NickName" "" "HP LaserJet p1505, hpcups $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LaserJet p1505"
@@ -1640,7 +1658,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_p1505.ppd"
        Attribute "Product" "" "(HP LaserJet p1505 Printer)"
      }
-@@ -16927,7 +16930,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -17377,7 +17380,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet p1005"
        Attribute "NickName" "" "HP LaserJet p1005, hpcups $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LaserJet p1005"
@@ -1649,7 +1667,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_p1005.ppd"
        Attribute "Product" "" "(HP LaserJet p1005 Printer)"
      }
-@@ -16935,7 +16938,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -17385,7 +17388,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet p1006"
        Attribute "NickName" "" "HP LaserJet p1006, hpcups $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LaserJet p1006"
@@ -1658,7 +1676,7 @@ diff -up hplip-3.13.4/prnt/drv/hpcups.drv.in.deviceIDs-drv hplip-3.13.4/prnt/drv
        PCFileName "hp-laserjet_p1006.ppd"
        Attribute "Product" "" "(HP LaserJet p1006 Printer)"
      }
-@@ -16943,7 +16946,7 @@ Group "RLT/HP Real Life Technologies"
+@@ -17393,7 +17396,7 @@ Group "RLT/HP Real Life Technologies"
        ModelName "HP LaserJet p1007"
        Attribute "NickName" "" "HP LaserJet p1007, hpcups $Version, requires proprietary plugin"
        Attribute "ShortNickName" "" "HP LaserJet p1007"
diff --git a/hplip-deviceIDs-ppd.patch b/hplip-deviceIDs-ppd.patch
index ca27037..0399f5b 100644
--- a/hplip-deviceIDs-ppd.patch
+++ b/hplip-deviceIDs-ppd.patch
@@ -1,6 +1,6 @@
-diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_2500-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:24.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-color_laserjet_2500-ps.ppd	2013-04-09 12:24:19.815228054 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2500-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:07.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2500-ps.ppd	2013-07-23 12:41:46.653625035 +0200
 @@ -42,6 +42,7 @@
  
  
@@ -9,9 +9,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_2500-ps.ppd.deviceIDs-ppd hplip-
  *Manufacturer:	"HP"
  *Product: "(hp color LaserJet 2500)"
  *Product: "(Hewlett-Packard hp color LaserJet 2500)"
-diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_2500_series-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:24.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-color_laserjet_2500_series-ps.ppd	2013-04-09 12:24:19.816228040 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2500_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:07.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2500_series-ps.ppd	2013-07-23 12:41:46.654625021 +0200
 @@ -42,6 +42,7 @@
  
  
@@ -20,9 +20,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_2500_series-ps.ppd.deviceIDs-ppd
  *Manufacturer:	"HP"
  *Product: "(hp color LaserJet 2500)"
  *Product: "(Hewlett-Packard hp color LaserJet 2500)"
-diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_2550_series-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:24.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-color_laserjet_2550_series-ps.ppd	2013-04-09 12:24:19.817228026 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2550_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:07.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2550_series-ps.ppd	2013-07-23 12:41:46.655625007 +0200
 @@ -42,6 +42,7 @@
  
  
@@ -31,9 +31,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_2550_series-ps.ppd.deviceIDs-ppd
  *Manufacturer:	"HP"
  *Product: "(hp color LaserJet 2550 series)"
  *Product: "(Hewlett-Packard hp color LaserJet 2550 series)"
-diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_2605dn-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:24.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-color_laserjet_2605dn-ps.ppd	2013-04-09 12:24:19.818228012 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2605dn-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:07.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2605dn-ps.ppd	2013-07-23 12:41:46.656624993 +0200
 @@ -46,6 +46,7 @@
  
  *% Product Name and Version Information
@@ -42,9 +42,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_2605dn-ps.ppd.deviceIDs-ppd hpli
  *Product: "(HP Color LaserJet 2605)"
  *Product: "(Hewlett-Packard HP Color LaserJet 2605)"
  *Product: "(HP Color LaserJet 2605dn)"
-diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_2840-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:24.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-color_laserjet_2840-ps.ppd	2013-04-09 12:24:19.819227998 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_2840-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-color_laserjet_2840-ps.ppd	2013-07-23 12:41:46.657624979 +0200
 @@ -43,6 +43,7 @@
  
  *% Product Name and Version Information
@@ -53,9 +53,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_2840-ps.ppd.deviceIDs-ppd hplip-
  *Product: "(HP Color LaserJet 2820)"
  *Product: "(Hewlett-Packard HP Color LaserJet 2820)"
  *Product: "(HP Color LaserJet 2830)"
-diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_3700n-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:24.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-color_laserjet_3700n-ps.ppd	2013-04-09 12:24:19.820227984 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_3700n-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-color_laserjet_3700n-ps.ppd	2013-07-23 12:41:46.658624966 +0200
 @@ -41,6 +41,7 @@
  
  
@@ -64,9 +64,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_3700n-ps.ppd.deviceIDs-ppd hplip
  *Manufacturer:	"HP"
  *Product: 	"(hp color LaserJet 3700)"
  *Product: "(Hewlett-Packard hp color LaserJet 3700)"
-diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_3700-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:24.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-color_laserjet_3700-ps.ppd	2013-04-09 12:24:19.822227956 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_3700-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-color_laserjet_3700-ps.ppd	2013-07-23 12:41:46.659624952 +0200
 @@ -41,6 +41,7 @@
  
  
@@ -75,9 +75,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_3700-ps.ppd.deviceIDs-ppd hplip-
  *Manufacturer:	"HP"
  *Product: 	"(hp color LaserJet 3700)"
  *Product: "(Hewlett-Packard hp color LaserJet 3700)"
-diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_3800-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:24.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-color_laserjet_3800-ps.ppd	2013-04-09 12:24:19.823227942 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_3800-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-color_laserjet_3800-ps.ppd	2013-07-23 12:41:46.660624938 +0200
 @@ -47,6 +47,7 @@
  
  *% Product Name and Version Information
@@ -86,9 +86,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_3800-ps.ppd.deviceIDs-ppd hplip-
  *Product: 	"(HP Color LaserJet 3800)"
  *Product: "(Hewlett-Packard HP Color LaserJet 3800)"
  *ModelName:	"HP Color LaserJet 3800"
-diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_4550-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:24.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-color_laserjet_4550-ps.ppd	2013-04-09 12:24:19.824227928 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4550-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4550-ps.ppd	2013-07-23 12:41:46.661624924 +0200
 @@ -40,6 +40,7 @@
  
  
@@ -97,9 +97,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_4550-ps.ppd.deviceIDs-ppd hplip-
  *Manufacturer:	"HP"
  *Product: 	"(HP Color LaserJet 4550 )"
  *Product: "(Hewlett-Packard HP Color LaserJet 4550 )"
-diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_4600-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:24.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-color_laserjet_4600-ps.ppd	2013-04-09 12:24:19.826227900 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4600-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4600-ps.ppd	2013-07-23 12:41:46.662624910 +0200
 @@ -41,6 +41,7 @@
  
  
@@ -108,9 +108,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_4600-ps.ppd.deviceIDs-ppd hplip-
  *Manufacturer:	"HP"
  *Product: 	"(hp color LaserJet 4600)"
  *Product: "(Hewlett-Packard hp color LaserJet 4600)"
-diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_4600_series-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:24.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-color_laserjet_4600_series-ps.ppd	2013-04-09 12:24:19.827227886 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4600_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4600_series-ps.ppd	2013-07-23 12:41:46.663624897 +0200
 @@ -41,6 +41,7 @@
  
  
@@ -119,9 +119,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_4600_series-ps.ppd.deviceIDs-ppd
  *Manufacturer:	"HP"
  *Product: 	"(hp color LaserJet 4600)"
  *Product: "(Hewlett-Packard hp color LaserJet 4600)"
-diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_4650-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:24.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-color_laserjet_4650-ps.ppd	2013-04-09 12:24:19.828227872 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4650-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4650-ps.ppd	2013-07-23 12:41:46.664624883 +0200
 @@ -43,6 +43,7 @@
  
  
@@ -130,9 +130,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_4650-ps.ppd.deviceIDs-ppd hplip-
  *Manufacturer:	"HP"
  *Product: 	"(hp color LaserJet 4650)"
  *Product: "(Hewlett-Packard hp color LaserJet 4650)"
-diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_4700-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:25.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-color_laserjet_4700-ps.ppd	2013-04-09 12:24:19.830227844 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_4700-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-color_laserjet_4700-ps.ppd	2013-07-23 12:41:46.665624869 +0200
 @@ -45,6 +45,7 @@
  
  
@@ -141,9 +141,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_4700-ps.ppd.deviceIDs-ppd hplip-
  *Manufacturer:	"HP"
  *Product: 	"(HP Color LaserJet 4700)"
  *Product: "(Hewlett-Packard HP Color LaserJet 4700)"
-diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_5550-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:25.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-color_laserjet_5550-ps.ppd	2013-04-09 12:24:19.831227830 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_5550-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-color_laserjet_5550-ps.ppd	2013-07-23 12:41:46.666624855 +0200
 @@ -43,6 +43,7 @@
  
  
@@ -152,9 +152,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_5550-ps.ppd.deviceIDs-ppd hplip-
  *Manufacturer:	"HP"
  *Product: "(hp color LaserJet 5550 )"
  *Product: "(Hewlett-Packard hp color LaserJet 5550 )"
-diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:25.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd	2013-04-09 12:24:19.832227816 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd	2013-07-23 12:41:46.667624841 +0200
 @@ -44,6 +44,7 @@
  
  
@@ -163,9 +163,20 @@ diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_cm3530_mfp-ps.ppd.deviceIDs-ppd
  *Manufacturer:	"HP"
  *Product: 	"(HP Color LaserJet CM3530 MFP)"
  *Product: "(Hewlett-Packard HP Color LaserJet CM3530 MFP)"
-diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:25.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd	2013-04-09 12:24:19.834227788 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd.deviceIDs-ppd	2013-07-23 12:46:53.884383444 +0200
++++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4540_mfp-ps.ppd	2013-07-23 12:43:46.000000000 +0200
+@@ -32,6 +32,7 @@
+ *LanguageEncoding: ISOLatin1
+ *PCFileName: "HPP00004.PPD"
+ *Product: "(HP Color LaserJet CM4540 MFP)"
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CM4540 MFP;"
+ *Manufacturer: "HP"
+ *ModelName: "HP Color LaserJet CM4540 MFP"
+ *ShortNickName: "HP Color LaserJet CM4540 MFP"
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:08.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd	2013-07-23 12:41:46.668624828 +0200
 @@ -43,6 +43,7 @@
  
  
@@ -174,9 +185,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_cm4730_mfp-ps.ppd.deviceIDs-ppd
  *Manufacturer:	"HP"
  *Product: 	"(HP Color LaserJet CM4730 MFP)"
  *Product: "(Hewlett-Packard HP Color LaserJet CM4730 MFP)"
-diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-color_laserjet_cp3525-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:25.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-color_laserjet_cp3525-ps.ppd	2013-04-09 12:24:19.836227760 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cp3525-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cp3525-ps.ppd	2013-07-23 12:41:46.670624800 +0200
 @@ -44,6 +44,7 @@
  
  
@@ -185,9 +196,20 @@ diff -up hplip-3.13.4/prnt/ps/hp-color_laserjet_cp3525-ps.ppd.deviceIDs-ppd hpli
  *Manufacturer:	"HP"
  *Product: 	"(HP Color LaserJet CP3525)"
  *Product: "(Hewlett-Packard HP Color LaserJet CP3525)"
-diff -up hplip-3.13.4/prnt/ps/hp-designjet_t770_postscript-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-designjet_t770_postscript-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-designjet_t770_postscript-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-designjet_t770_postscript-ps.ppd	2013-04-09 12:24:19.836227760 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-color_laserjet_cp4005-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-color_laserjet_cp4005-ps.ppd.deviceIDs-ppd	2013-07-23 12:45:48.252289396 +0200
++++ hplip-3.13.7/prnt/ps/hp-color_laserjet_cp4005-ps.ppd	2013-07-23 12:44:34.000000000 +0200
+@@ -44,6 +44,7 @@
+ 
+ 
+ *% Product Name and Version Information
++*1284DeviceID: "MFG:Hewlett-Packard;MDL:HP Color LaserJet CP4005;"
+ *Manufacturer:	"HP"
+ *Product: 	"(HP Color LaserJet CP4005)"
+ *Product: "(Hewlett-Packard HP Color LaserJet CP4005)"
+diff -up hplip-3.13.7/prnt/ps/hp-designjet_t770_postscript-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-designjet_t770_postscript-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-designjet_t770_postscript-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-designjet_t770_postscript-ps.ppd	2013-07-23 12:41:46.670624800 +0200
 @@ -38,6 +38,7 @@
  *ShortNickName: "HP Designjet T770 PostScript"
  *NickName: "HP Designjet T770ps 44in Postscript (recommended)"
@@ -196,9 +218,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-designjet_t770_postscript-ps.ppd.deviceIDs-ppd
  
  
  *% =============== Device Capabilities And Keywords for supporting Alert and Status Mechanism =============== 
-diff -up hplip-3.13.4/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-designjet_t770ps_24in-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-designjet_t770ps_24in-ps.ppd	2013-04-09 12:24:19.837227746 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-designjet_t770ps_24in-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-designjet_t770ps_24in-ps.ppd	2013-07-23 12:41:46.671624786 +0200
 @@ -38,6 +38,7 @@
  *ShortNickName: "HP Designjet T770ps 24in"
  *NickName: "HP Designjet T770ps 24in Postscript (recommended)"
@@ -207,9 +229,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-designjet_t770ps_24in-ps.ppd.deviceIDs-ppd hpli
  
  
  *% =============== Device Capabilities And Keywords for supporting Alert and Status Mechanism =============== 
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_1200n-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_1200n-ps.ppd	2013-04-09 12:24:19.838227732 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1200n-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_1200n-ps.ppd	2013-07-23 12:41:46.671624786 +0200
 @@ -54,6 +54,7 @@
  *Product: "(HP LaserJet 1200)"
  *Product: "(Hewlett-Packard HP LaserJet 1200)"
@@ -218,9 +240,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1200n-ps.ppd.deviceIDs-ppd hplip-3.13.
  *PSVersion: "(2014.116) 0"
  
  *%=================================================
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_1200-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_1200-ps.ppd	2013-04-09 12:24:19.838227732 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1200-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_1200-ps.ppd	2013-07-23 12:41:46.672624772 +0200
 @@ -54,6 +54,7 @@
  *Product: "(HP LaserJet 1200)"
  *Product: "(Hewlett-Packard HP LaserJet 1200)"
@@ -229,9 +251,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1200-ps.ppd.deviceIDs-ppd hplip-3.13.4
  *PSVersion: "(2014.116) 0"
  
  *%=================================================
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_1300n-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_1300n-ps.ppd	2013-04-09 12:24:19.839227718 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1300n-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_1300n-ps.ppd	2013-07-23 12:41:46.673624759 +0200
 @@ -58,6 +58,7 @@
  *Product: "(Hewlett-Packard hp LaserJet 1300n)"
  *Product: "(HP LaserJet 1300n)"
@@ -240,9 +262,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1300n-ps.ppd.deviceIDs-ppd hplip-3.13.
  *PSVersion: "(2014.116) 0"
  
  *%=================================================
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_1300-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_1300-ps.ppd	2013-04-09 12:24:19.840227704 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1300-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_1300-ps.ppd	2013-07-23 12:41:46.673624759 +0200
 @@ -58,6 +58,7 @@
  *Product: "(Hewlett-Packard hp LaserJet 1300n)"
  *Product: "(HP LaserJet 1300n)"
@@ -251,9 +273,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1300-ps.ppd.deviceIDs-ppd hplip-3.13.4
  *PSVersion: "(2014.116) 0"
  
  *%=================================================
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_1300xi-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_1300xi-ps.ppd	2013-04-09 12:24:19.841227690 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1300xi-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_1300xi-ps.ppd	2013-07-23 12:41:46.674624745 +0200
 @@ -58,6 +58,7 @@
  *Product: "(Hewlett-Packard hp LaserJet 1300n)"
  *Product: "(HP LaserJet 1300n)"
@@ -262,9 +284,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1300xi-ps.ppd.deviceIDs-ppd hplip-3.13
  *PSVersion: "(2014.116) 0"
  
  *%=================================================
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_1320n-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_1320n-ps.ppd	2013-04-09 12:24:19.842227677 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320n-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_1320n-ps.ppd	2013-07-23 12:41:46.675624731 +0200
 @@ -55,6 +55,7 @@
  *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
  *Product: "(HP LaserJet 1320 series)"
@@ -273,9 +295,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1320n-ps.ppd.deviceIDs-ppd hplip-3.13.
  *PSVersion: "(2014.116) 0"
  
  *%=================================================
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_1320nw-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_1320nw-ps.ppd	2013-04-09 12:24:19.843227663 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320nw-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_1320nw-ps.ppd	2013-07-23 12:41:46.676624717 +0200
 @@ -55,6 +55,7 @@
  *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
  *Product: "(HP LaserJet 1320 series)"
@@ -284,9 +306,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1320nw-ps.ppd.deviceIDs-ppd hplip-3.13
  *PSVersion: "(2014.116) 0"
  
  *%=================================================
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_1320-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_1320-ps.ppd	2013-04-09 12:24:19.844227649 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_1320-ps.ppd	2013-07-23 12:41:46.677624703 +0200
 @@ -55,6 +55,7 @@
  *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
  *Product: "(HP LaserJet 1320 series)"
@@ -295,9 +317,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1320-ps.ppd.deviceIDs-ppd hplip-3.13.4
  *PSVersion: "(2014.116) 0"
  
  *%=================================================
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_1320_series-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_1320_series-ps.ppd	2013-04-09 12:24:19.845227635 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_1320_series-ps.ppd	2013-07-23 12:41:46.677624703 +0200
 @@ -55,6 +55,7 @@
  *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
  *Product: "(HP LaserJet 1320 series)"
@@ -306,9 +328,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1320_series-ps.ppd.deviceIDs-ppd hplip
  *PSVersion: "(2014.116) 0"
  
  *%=================================================
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_1320tn-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_1320tn-ps.ppd	2013-04-09 12:24:19.846227621 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_1320tn-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_1320tn-ps.ppd	2013-07-23 12:41:46.678624689 +0200
 @@ -55,6 +55,7 @@
  *Product: "(Hewlett-Packard hp LaserJet 1320 series)"
  *Product: "(HP LaserJet 1320 series)"
@@ -317,9 +339,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_1320tn-ps.ppd.deviceIDs-ppd hplip-3.13
  *PSVersion: "(2014.116) 0"
  
  *%=================================================
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_2100-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_2100-ps.ppd	2013-04-09 12:24:19.847227607 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2100-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_2100-ps.ppd	2013-07-23 12:41:46.679624676 +0200
 @@ -54,6 +54,7 @@
  *Product: "(HP LaserJet 2100 Series)"
  *Product: "(Hewlett-Packard HP LaserJet 2100 Series)"
@@ -328,9 +350,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2100-ps.ppd.deviceIDs-ppd hplip-3.13.4
  *PSVersion: "(2014.111) 1"
  
  *%=================================================
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_2100_series-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_2100_series-ps.ppd	2013-04-09 12:24:19.847227607 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2100_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_2100_series-ps.ppd	2013-07-23 12:41:46.680624662 +0200
 @@ -54,6 +54,7 @@
  *Product: "(HP LaserJet 2100 Series)"
  *Product: "(Hewlett-Packard HP LaserJet 2100 Series)"
@@ -339,9 +361,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2100_series-ps.ppd.deviceIDs-ppd hplip
  *PSVersion: "(2014.111) 1"
  
  *%=================================================
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2200-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_2200-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_2200-ps.ppd.deviceIDs-ppd	2013-05-10 17:02:26.193850985 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_2200-ps.ppd	2013-05-10 17:01:12.961873869 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2200-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2200-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_2200-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:09.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_2200-ps.ppd	2013-07-23 12:41:46.680624662 +0200
 @@ -54,6 +54,7 @@
  *Product: "(HP LaserJet 2200)"
  *Product: "(Hewlett-Packard HP LaserJet 2200)"
@@ -350,9 +372,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2200-ps.ppd.deviceIDs-ppd hplip-3.13.4
  *PSVersion: "(2014.116) 0"
  
  *%=================================================
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2200_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_2200_series-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_2200_series-ps.ppd.deviceIDs-ppd	2013-05-10 17:02:23.190892928 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_2200_series-ps.ppd	2013-05-10 17:01:02.231023762 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2200_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2200_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_2200_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_2200_series-ps.ppd	2013-07-23 12:41:46.681624648 +0200
 @@ -54,6 +54,7 @@
  *Product: "(HP LaserJet 2200)"
  *Product: "(Hewlett-Packard HP LaserJet 2200)"
@@ -361,9 +383,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2200_series-ps.ppd.deviceIDs-ppd hplip
  *PSVersion: "(2014.116) 0"
  
  *%=================================================
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_2300-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_2300-ps.ppd	2013-04-09 12:24:19.848227593 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2300-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_2300-ps.ppd	2013-07-23 12:41:46.682624634 +0200
 @@ -59,6 +59,7 @@
  *Product: "(Hewlett-Packard hp LaserJet 2300L)"
  *Product: "(HP LaserJet 2300L)"
@@ -372,9 +394,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2300-ps.ppd.deviceIDs-ppd hplip-3.13.4
  *PSVersion: "(3010.107) 0"
  
  *%=================================================
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_2300_series-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_2300_series-ps.ppd	2013-04-09 12:24:19.849227579 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2300_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_2300_series-ps.ppd	2013-07-23 12:41:46.683624620 +0200
 @@ -59,6 +59,7 @@
  *Product: "(Hewlett-Packard hp LaserJet 2300L)"
  *Product: "(HP LaserJet 2300L)"
@@ -383,9 +405,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2300_series-ps.ppd.deviceIDs-ppd hplip
  *PSVersion: "(3010.107) 0"
  
  *%=================================================
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_2420-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_2420-ps.ppd	2013-04-09 12:24:19.851227551 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_2420-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_2420-ps.ppd	2013-07-23 12:41:46.684624607 +0200
 @@ -57,6 +57,7 @@
  *Product: "(Hewlett-Packard hp LaserJet 2420)"
  *Product: "(HP LaserJet 2420)"
@@ -394,9 +416,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_2420-ps.ppd.deviceIDs-ppd hplip-3.13.4
  *PSVersion: "(3010.107) 0"
  
  *%=================================================
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_3390-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_3390-ps.ppd	2013-04-09 12:24:19.852227537 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_3390-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_3390-ps.ppd	2013-07-23 12:41:46.684624607 +0200
 @@ -58,6 +58,7 @@
  *Product: "(HP LaserJet 3390)"
  *Product: "(Hewlett-Packard HP LaserJet 3390)"
@@ -405,9 +427,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_3390-ps.ppd.deviceIDs-ppd hplip-3.13.4
  *PSVersion: "(2014.116) 0"
  
  *%=================================================
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_4000_series-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_4000_series-ps.ppd	2013-04-09 12:24:19.853227523 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4000_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_4000_series-ps.ppd	2013-07-23 12:41:46.685624593 +0200
 @@ -49,6 +49,7 @@
  
  
@@ -416,9 +438,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4000_series-ps.ppd.deviceIDs-ppd hplip
  *Product: "(HP LaserJet 4000 Series)"
  *Product: "(Hewlett-Packard HP LaserJet 4000 Series)"
  *ModelName: "HP LaserJet 4000 Series"
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_4050_series-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_4050_series-ps.ppd	2013-04-09 12:24:19.854227509 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4050_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_4050_series-ps.ppd	2013-07-23 12:41:46.686624579 +0200
 @@ -49,6 +49,7 @@
  
  
@@ -427,9 +449,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4050_series-ps.ppd.deviceIDs-ppd hplip
  *Product: "(HP LaserJet 4050 Series )"
  *Product: "(Hewlett-Packard HP LaserJet 4050 Series )"
  *Product: "(HP LaserJet 4050 Series)"
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_4100_series-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_4100_series-ps.ppd	2013-04-09 12:24:19.855227495 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4100_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_4100_series-ps.ppd	2013-07-23 12:41:46.687624565 +0200
 @@ -48,6 +48,7 @@
  
  
@@ -438,9 +460,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4100_series-ps.ppd.deviceIDs-ppd hplip
  *Product: "(HP LaserJet 4100 Series )"
  *Product: "(Hewlett-Packard HP LaserJet 4100 Series )"
  *Product: "(HP LaserJet 4100 Series)"
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_4200-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_4200-ps.ppd	2013-04-09 12:24:19.856227481 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4200-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_4200-ps.ppd	2013-07-23 12:41:46.688624551 +0200
 @@ -49,6 +49,7 @@
  
  
@@ -449,9 +471,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4200-ps.ppd.deviceIDs-ppd hplip-3.13.4
  *Product: "(hp LaserJet 4200)"
  *Product: "(Hewlett-Packard hp LaserJet 4200)"
  *Product: "(HP LaserJet 4200)"
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_4250-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_4250-ps.ppd	2013-04-09 12:24:19.857227467 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4250-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_4250-ps.ppd	2013-07-23 12:41:46.689624538 +0200
 @@ -50,6 +50,7 @@
  
  
@@ -460,9 +482,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4250-ps.ppd.deviceIDs-ppd hplip-3.13.4
  *Product: "(hp LaserJet 4250)"
  *Product: "(Hewlett-Packard hp LaserJet 4250)"
  *Product: "(HP LaserJet 4250)"
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_4300-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_4300-ps.ppd	2013-04-09 12:24:19.859227439 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4300-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_4300-ps.ppd	2013-07-23 12:41:46.690624524 +0200
 @@ -49,6 +49,7 @@
  
  
@@ -471,9 +493,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4300-ps.ppd.deviceIDs-ppd hplip-3.13.4
  *Product: "(hp LaserJet 4300)"
  *Product: "(Hewlett-Packard hp LaserJet 4300)"
  *Product: "(HP LaserJet 4300)"
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_4350-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:26.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_4350-ps.ppd	2013-04-09 12:24:19.860227425 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_4350-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_4350-ps.ppd	2013-07-23 12:41:46.691624510 +0200
 @@ -50,6 +50,7 @@
  
  
@@ -482,9 +504,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_4350-ps.ppd.deviceIDs-ppd hplip-3.13.4
  *Product: "(hp LaserJet 4350)"
  *Product: "(Hewlett-Packard hp LaserJet 4350)"
  *Product: "(HP LaserJet 4350)"
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_5100_series-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:27.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_5100_series-ps.ppd	2013-04-09 12:24:19.861227411 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_5100_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:10.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_5100_series-ps.ppd	2013-07-23 12:41:46.692624496 +0200
 @@ -50,6 +50,7 @@
  
  
@@ -493,9 +515,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_5100_series-ps.ppd.deviceIDs-ppd hplip
  *Product: "(HP LaserJet 5100 Series)"
  *Product: "(Hewlett-Packard HP LaserJet 5100 Series)"
  *ModelName: "HP LaserJet 5100 Series"
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_8000-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:27.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_8000-ps.ppd	2013-04-09 12:24:19.863227383 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_8000-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:11.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_8000-ps.ppd	2013-07-23 12:41:46.694624469 +0200
 @@ -52,6 +52,7 @@
  *%=================================================
  *% 		 Product Version Information
@@ -504,9 +526,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_8000-ps.ppd.deviceIDs-ppd hplip-3.13.4
  *ModelName: "HP LaserJet 8000 Series"
  *ShortNickName: "HP LaserJet 8000 Series"
  *NickName: "HP LaserJet 8000 Series Postscript (recommended)"
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_8000_series-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:27.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_8000_series-ps.ppd	2013-04-09 12:24:19.864227369 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_8000_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:11.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_8000_series-ps.ppd	2013-07-23 12:41:46.695624455 +0200
 @@ -52,6 +52,7 @@
  *%=================================================
  *% 		 Product Version Information
@@ -515,9 +537,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_8000_series-ps.ppd.deviceIDs-ppd hplip
  *ModelName: "HP LaserJet 8000 Series"
  *ShortNickName: "HP LaserJet 8000 Series"
  *NickName: "HP LaserJet 8000 Series Postscript (recommended)"
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:27.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd	2013-04-09 12:24:19.865227355 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:11.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd	2013-07-23 12:41:46.696624441 +0200
 @@ -51,6 +51,7 @@
  *%=================================================
  *% 		 Product Version Information
@@ -526,9 +548,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_m3027_mfp-ps.ppd.deviceIDs-ppd hplip-3
  *ModelName: "HP LaserJet M3027 MFP"
  *ShortNickName: "HP LaserJet M3027 MFP"
  *NickName: "HP LaserJet M3027 MFP Postscript (recommended)"
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:27.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd	2013-04-09 12:24:19.866227341 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:11.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd	2013-07-23 12:41:46.697624427 +0200
 @@ -52,6 +52,7 @@
  *%=================================================
  *% 		 Product Version Information
@@ -537,9 +559,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_m3035_mfp-ps.ppd.deviceIDs-ppd hplip-3
  *ModelName: "HP LaserJet M3035 MFP"
  *ShortNickName: "HP LaserJet M3035 MFP"
  *NickName: "HP LaserJet M3035 MFP Postscript (recommended)"
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_p2015_series-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:28.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_p2015_series-ps.ppd	2013-04-09 12:24:19.867227327 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_p2015_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:11.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_p2015_series-ps.ppd	2013-07-23 12:41:46.698624413 +0200
 @@ -58,6 +58,7 @@
  *Product: "(HP LaserJet P2015 Series)"
  *Product: "(Hewlett-Packard HP LaserJet P2015 Series)"
@@ -548,9 +570,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_p2015_series-ps.ppd.deviceIDs-ppd hpli
  *PSVersion: "(3010.107) 0"
  
  *%=================================================
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_p3005-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:28.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_p3005-ps.ppd	2013-04-09 12:24:19.868227313 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_p3005-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:11.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_p3005-ps.ppd	2013-07-23 12:41:46.699624399 +0200
 @@ -50,6 +50,7 @@
  *%=================================================
  *% 		 Product Version Information
@@ -559,9 +581,9 @@ diff -up hplip-3.13.4/prnt/ps/hp-laserjet_p3005-ps.ppd.deviceIDs-ppd hplip-3.13.
  *ModelName: "HP LaserJet P3005"
  *ShortNickName: "HP LaserJet P3005"
  *NickName: "HP LaserJet P3005 Postscript (recommended)"
-diff -up hplip-3.13.4/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd hplip-3.13.4/prnt/ps/hp-laserjet_p3010_series-ps.ppd
---- hplip-3.13.4/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd	2013-04-08 11:59:28.000000000 +0200
-+++ hplip-3.13.4/prnt/ps/hp-laserjet_p3010_series-ps.ppd	2013-04-09 12:24:19.870227285 +0200
+diff -up hplip-3.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd hplip-3.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd
+--- hplip-3.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd.deviceIDs-ppd	2013-07-23 07:19:11.000000000 +0200
++++ hplip-3.13.7/prnt/ps/hp-laserjet_p3010_series-ps.ppd	2013-07-23 12:41:46.700624386 +0200
 @@ -45,6 +45,7 @@
  
  
diff --git a/hplip.spec b/hplip.spec
index b674a19..4d2d281 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -164,13 +164,15 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ).
 # LaserJet M1536dnf MFP (bug #743915)
 # LaserJet M1522nf MFP (bug #745498)
 # LaserJet M1319f MFP (bug #746614)
-# LaserJet M1120 MFP (bug #754139).
+# LaserJet M1120 MFP (bug #754139)
 # LaserJet P1007 (bug #585272)
 # LaserJet P1505 (bug #680951)
 # LaserJet P2035 (Ubuntu #917703)
 # PSC 1600 series (bug #743821)
 # Officejet 6300 series (bug #689378)
 # LaserJet Professional P1102w (bug #795958)
+# Color LaserJet CM4540 MFP (bug #968177)
+# Color LaserJet cp4005 (bug #980976)
 %patch5 -p1 -b .deviceIDs-drv
 chmod +x %{SOURCE2}
 mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs}
@@ -228,7 +230,9 @@ mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs}
 #                4650/4700/5550/CP3525 (bug #659040)
 # Color LaserJet CM4730 MFP (bug #658831)
 # Color LaserJet CM3530 MFP (bug #659381)
-# Designjet T770 (bug #747957).
+# Designjet T770 (bug #747957)
+# Color LaserJet CM4540 MFP (bug #968177)
+# Color LaserJet cp4005 (bug #980976)
 for ppd_file in $(grep '^diff' %{PATCH17} | cut -d " " -f 4);
 do
   gunzip ${ppd_file#*/}.gz
@@ -522,6 +526,8 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 %changelog
 * Tue Jul 23 2013 Jiri Popelka <jpopelka@redhat.com> - 3.13.7-1
 - 3.13.7
+- Device IDs for CM4540 (bug #968177) and cp4005 (bug #980976).
+
 
 * Mon Jun 24 2013 Jiri Popelka <jpopelka@redhat.com> - 3.13.6-2
 - add one more arch-specific dependency.