diff -U0 foomatic-db-20100204/ChangeLog.device-ids-20100506 foomatic-db-20100204/ChangeLog
diff -up foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C3500_PS.ppd.device-ids-20100506 foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C3500_PS.ppd
--- foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C3500_PS.ppd.device-ids-20100506	2010-05-06 14:13:12.825050447 +0100
+++ foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C3500_PS.ppd	2010-05-06 14:13:27.623050310 +0100
@@ -41,6 +41,7 @@
 *PSVersion: "(3015.102) 2"
 *ShortNickName: "Ricoh Aficio MP C3500 PS"
 *NickName: "Ricoh Aficio MP C3500 PS"
+*1284DeviceID: "MFG:RICOH;MDL:Aficio MP C3500;CMD:PJL,RCS,PCL,PCLXL,POSTSCRIPT;"
 
 *%========== Basic Device Capabilities ==========
 
@@ -2309,4 +2310,4 @@ cleartomark\n"
 *CloseGroup: JobLog/Job Log
 
 
-*% end of Printer Description file
\ No newline at end of file
+*% end of Printer Description file
diff -up foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd.device-ids-20100506 foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd
--- foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd.device-ids-20100506	2010-05-06 14:13:12.956050897 +0100
+++ foomatic-db-20100204/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C420DN_PS.ppd	2010-05-06 14:13:27.625050334 +0100
@@ -41,6 +41,7 @@
 *PSVersion: "(3017.104) 2"
 *ShortNickName: "Ricoh Aficio SP C420DN PS"
 *NickName: "Ricoh Aficio SP C420DN PS"
+*1284DeviceID: "MFG:RICOH;MDL:Aficio SP C420DN;CMD:PJL,RCS,PCL,PCLXL,POSTSCRIPT,POSTSCRIPT,PCL,PCLXL;"
 
 *%PNP_NAME: "Aficio SP C420DN"
 *%LOADDLL_NAME32: "MFRICRES.dll"
@@ -1628,4 +1629,4 @@ cleartomark\n"
 *CloseGroup: JobLog/Job Log
 
 
-*% end of Printer Description file
\ No newline at end of file
+*% end of Printer Description file
diff -up foomatic-db-20100204/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C3500_PXL.ppd.device-ids-20100506 foomatic-db-20100204/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C3500_PXL.ppd
--- foomatic-db-20100204/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C3500_PXL.ppd.device-ids-20100506	2010-05-06 14:13:12.675050584 +0100
+++ foomatic-db-20100204/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C3500_PXL.ppd	2010-05-06 14:13:27.629926190 +0100
@@ -42,6 +42,7 @@
 *PSVersion: "(3015.102) 2"
 *ShortNickName: "Ricoh Aficio MP C3500 PXL"
 *NickName: "Ricoh Aficio MP C3500 PXL"
+*1284DeviceID: "MFG:RICOH;MDL:Aficio MP C3500;CMD:PJL,RCS,PCL,PCLXL,POSTSCRIPT;"
 
 *cupsVersion:      1.1
 *cupsManualCopies: True
diff -up foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_2605dn.xml.device-ids-20100506 foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_2605dn.xml
--- foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_2605dn.xml.device-ids-20100506	2010-05-06 14:13:27.638050300 +0100
+++ foomatic-db-20100204/db/source/printer/HP-Color_LaserJet_2605dn.xml	2010-05-06 14:13:27.638050300 +0100
@@ -0,0 +1,49 @@
+<printer id="printer/HP-Color_LaserJet_2605dn">
+  <make>HP</make>
+  <model>Color LaserJet 2605dn</model>
+  <mechanism>
+    <laser />
+    <color />
+    <resolution>
+      <dpi>
+        <x>600</x>
+        <y>600</y>
+      </dpi>
+    </resolution>
+  </mechanism>
+  <url>http://www.hp.com/</url>
+  <lang>
+    <postscript level="3" />
+    <pcl level="6" />
+    <pjl />
+    <text>
+      <charset>us-ascii</charset>
+    </text>
+  </lang>
+  <autodetect>
+    <general>
+      <commandset>JL,PML,POSTSCRIPT,PCLXL,PCL</commandset>
+      <manufacturer>Hewlett-Packard</manufacturer>
+      <model>HP Color LaserJet 2605dn</model>
+    </general>
+  </autodetect>
+  <functionality>A</functionality>
+  <driver>hplip</driver>
+  <drivers>
+    <driver>
+      <id>hplip</id>
+    </driver>
+  </drivers>
+  <comments>
+    <en>
+
+    For basic printing functionality use the Postscript PPD. For advanced functionality such
+    as printer status and maintenance features, use the
+    &lt;a href=&quot;http://hplipopensource.com/&quot;&gt;
+    HPLIP driver&lt;/a&gt; (which includes HPIJS). &lt;p&gt;&lt;p&gt;
+
+      Consumables/Refills: 1 toner cartridge for each color, imaging drum&lt;p&gt;
+
+    </en>
+  </comments>
+</printer>
diff -up foomatic-db-20100204/db/source/printer/HP-DeskJet_F300.xml.device-ids-20100506 foomatic-db-20100204/db/source/printer/HP-DeskJet_F300.xml
--- foomatic-db-20100204/db/source/printer/HP-DeskJet_F300.xml.device-ids-20100506	2010-05-06 14:13:05.086050619 +0100
+++ foomatic-db-20100204/db/source/printer/HP-DeskJet_F300.xml	2010-05-06 14:13:27.638050300 +0100
@@ -16,11 +16,6 @@
     <proprietary />
   </lang>
   <autodetect>
-    <general>
-      <commandset>LDL,MLC,PML,DYN</commandset>
-      <manufacturer>Hewlett-Packard</manufacturer>
-      <model>Deskjet F300 series</model>
-    </general>
     <usb>
       <commandset>LDL,MLC,PML,DYN</commandset>
       <manufacturer>HP</manufacturer>
diff -up foomatic-db-20100204/db/source/printer/HP-OfficeJet_6200.xml.device-ids-20100506 foomatic-db-20100204/db/source/printer/HP-OfficeJet_6200.xml
--- foomatic-db-20100204/db/source/printer/HP-OfficeJet_6200.xml.device-ids-20100506	2010-05-06 14:13:18.466926042 +0100
+++ foomatic-db-20100204/db/source/printer/HP-OfficeJet_6200.xml	2010-05-06 14:13:27.639050556 +0100
@@ -21,7 +21,7 @@
     <general>
       <commandset>MLC,PCL,PML,DW-PCL,DESKJET,DYN</commandset>
       <manufacturer>HP</manufacturer>
-      <model>Officejet 6100 series</model>
+      <model>Officejet 6200 series</model>
     </general>
   </autodetect>
   <functionality>B</functionality>
diff -up foomatic-db-20100204/db/source/printer/HP-PSC_1400.xml.device-ids-20100506 foomatic-db-20100204/db/source/printer/HP-PSC_1400.xml
--- foomatic-db-20100204/db/source/printer/HP-PSC_1400.xml.device-ids-20100506	2010-05-06 14:13:05.182049990 +0100
+++ foomatic-db-20100204/db/source/printer/HP-PSC_1400.xml	2010-05-06 14:13:27.639926552 +0100
@@ -16,11 +16,6 @@
     <proprietary />
   </lang>
   <autodetect>
-    <general>
-      <commandset>LDL,MLC,PML,DYN</commandset>
-      <manufacturer>Hewlett-Packard</manufacturer>
-      <model>psc 1200 series</model>
-    </general>
     <usb>
       <commandset>LDL,MLC,PML,DYN</commandset>
       <manufacturer>HP</manufacturer>