diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_2500.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_2500.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_2500.xml.device-ids-20101202	2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_2500.xml	2010-12-02 16:00:22.000000000 +0100
@@ -20,6 +20,13 @@
       <charset>us-ascii</charset>
     </text>
   </lang>
+  <autodetect>
+    <usb>
+      <commandset>PJL,MLC,BIDI-ECP,POSTSCRIPT,PJL,PCLXL,PCL</commandset>
+      <manufacturer>Hewlett-Packard</manufacturer>
+      <model>hp color LaserJet 2500</model>
+    </usb>
+  </autodetect>
   <functionality>A</functionality>
   <driver>hplip</driver>
   <drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_3700.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_3700.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_3700.xml.device-ids-20101202	2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_3700.xml	2010-12-02 16:00:22.000000000 +0100
@@ -20,6 +20,13 @@
       <charset>us-ascii</charset>
     </text>
   </lang>
+  <autodetect>
+    <usb>
+      <commandset>PJL,MLC,BIDI-ECP,PCLXL,PCL,PJL,PDF,POSTSCRIPT</commandset>
+      <manufacturer>Hewlett-Packard</manufacturer>
+      <model>hp color LaserJet 3700</model>
+    </usb>
+  </autodetect>
   <functionality>A</functionality>
   <driver>hplip</driver>
   <drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4550.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4550.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4550.xml.device-ids-20101202	2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4550.xml	2010-12-02 16:08:58.000000000 +0100
@@ -22,7 +22,7 @@
   </lang>
   <autodetect>
     <parallel>
-      <commandset>PJL,MLC,PCL,POSTSCRIPT,PCLXL,P</commandset>
+      <commandset>PJL,MLC,PCL,POSTSCRIPT,PCLXL,PJL</commandset>
       <description>Hewlett-Packard Color LaserJet 4550</description>
       <manufacturer>Hewlett-Packard</manufacturer>
       <model>HP Color LaserJet 4550</model>
diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4650.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4650.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4650.xml.device-ids-20101202	2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4650.xml	2010-12-02 16:00:22.000000000 +0100
@@ -20,6 +20,13 @@
       <charset>us-ascii</charset>
     </text>
   </lang>
+  <autodetect>
+    <usb>
+      <commandset>PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,MIME,POSTSCRIPT</commandset>
+      <manufacturer>Hewlett-Packard</manufacturer>
+      <model>hp color LaserJet 4650</model>
+    </usb>
+  </autodetect>
   <functionality>A</functionality>
   <driver>hplip</driver>
   <drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4700.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4700.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4700.xml.device-ids-20101202	2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_4700.xml	2010-12-02 16:00:22.000000000 +0100
@@ -20,6 +20,13 @@
       <charset>us-ascii</charset>
     </text>
   </lang>
+  <autodetect>
+    <usb>
+      <commandset>PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,POSTSCRIPT</commandset>
+      <manufacturer>Hewlett-Packard</manufacturer>
+      <model>HP Color LaserJet 4700</model>
+    </usb>
+  </autodetect>
   <functionality>A</functionality>
   <driver>hplip</driver>
   <drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_5550.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_5550.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_5550.xml.device-ids-20101202	2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_5550.xml	2010-12-02 16:11:41.000000000 +0100
@@ -20,6 +20,13 @@
       <charset>us-ascii</charset>
     </text>
   </lang>
+  <autodetect>
+    <usb>
+      <commandset>PJL,MLC,BIDI-ECP,PCLXL,PCL,PDF,PJL,MIME,POSTSCRIPT</commandset>
+      <manufacturer>Hewlett-Packard</manufacturer>
+      <model>hp color LaserJet 5550</model>
+    </usb>
+  </autodetect>
   <functionality>A</functionality>
   <driver>hplip</driver>
   <drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_CM4730_MFP.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_CM4730_MFP.xml
--- foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_CM4730_MFP.xml.device-ids-20101202	2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-Color_LaserJet_CM4730_MFP.xml	2010-12-02 16:00:22.000000000 +0100
@@ -20,6 +20,13 @@
       <charset>us-ascii</charset>
     </text>
   </lang>
+  <autodetect>
+    <usb>
+      <commandset>PJL,MLC,BIDI-ECP,PJL,PCLXL,PCL,PDF,POSTSCRIPT</commandset>
+      <manufacturer>Hewlett-Packard</manufacturer>
+      <model>HP Color LaserJet CM4730 MFP</model>
+    </usb>
+  </autodetect>
   <functionality>A</functionality>
   <driver>hplip</driver>
   <drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-DeskJet_D4100.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-DeskJet_D4100.xml
--- foomatic-db-20101123/db/source/printer/HP-DeskJet_D4100.xml.device-ids-20101202	2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-DeskJet_D4100.xml	2010-12-02 16:00:22.000000000 +0100
@@ -19,8 +19,8 @@
     <usb>
       <commandset>LDL,DYN</commandset>
       <description>Deskjet D4100</description>
-      <manufacturer>hp</manufacturer>
-      <model>Deskjet D4100</model>
+      <manufacturer>HP</manufacturer>
+      <model>Deskjet D4100 series</model>
     </usb>
   </autodetect>
   <functionality>B</functionality>
diff -up foomatic-db-20101123/db/source/printer/HP-LaserJet_4050.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-LaserJet_4050.xml
--- foomatic-db-20101123/db/source/printer/HP-LaserJet_4050.xml.device-ids-20101202	2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-LaserJet_4050.xml	2010-12-02 16:05:27.000000000 +0100
@@ -20,15 +20,16 @@
     </text>
   </lang>
   <autodetect>
-    <parallel>
+    <general>
       <commandset>PJL,MLC,PCL,PCLXL,POSTSCRIPT</commandset>
-      <description>Hewlett-Packard LaserJet 4050 Series</description>
       <manufacturer>Hewlett-Packard</manufacturer>
       <model>HP LaserJet 4050 Series</model>
+    </general>
+    <parallel>
+      <description>Hewlett-Packard LaserJet 4050 Series</description>
     </parallel>
     <usb>
       <description>Hewlett-Packard LaserJet 4050 Series INTERFACE=7/1/1</description>
-      <model>HP LaserJet 4050 Series</model>
     </usb>
     <snmp>
       <description>HP LaserJet 4050 Series</description>
diff -up foomatic-db-20101123/db/source/printer/HP-LaserJet_4100.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-LaserJet_4100.xml
--- foomatic-db-20101123/db/source/printer/HP-LaserJet_4100.xml.device-ids-20101202	2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-LaserJet_4100.xml	2010-12-02 16:06:15.000000000 +0100
@@ -21,7 +21,7 @@
   </lang>
   <autodetect>
     <parallel>
-      <commandset>PJL,MLC,PCL,POSTSCRIPT,PCLXL,P</commandset>
+      <commandset>PJL,MLC,POSTSCRIPT,PCLXL,PJL,PCL</commandset>
       <description>Hewlett-Packard LaserJet 4100 Series</description>
       <manufacturer>Hewlett-Packard</manufacturer>
       <model>HP LaserJet 4100 Series</model>
diff -up foomatic-db-20101123/db/source/printer/HP-LaserJet_4350.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-LaserJet_4350.xml
--- foomatic-db-20101123/db/source/printer/HP-LaserJet_4350.xml.device-ids-20101202	2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-LaserJet_4350.xml	2010-12-02 16:00:22.000000000 +0100
@@ -19,19 +19,11 @@
     </text>
   </lang>
   <autodetect>
-    <general>
-      <ieee1284>MFG:HP;MDL:hp LaserJet 4350L;</ieee1284>
-      <manufacturer>HP</manufacturer>
-      <model>hp LaserJet 4350L</model>
-    </general>
-    <parallel>
-      <commandset>PJL,MLC,POSTSCRIPT,PJL,PCLXL,P</commandset>
+    <usb>
+      <commandset>PJL,MLC,PCLXL,PCL,PJL,POSTSCRIPT,PDF</commandset>
       <manufacturer>Hewlett-Packard</manufacturer>
-      <model>hp LaserJet 4300</model>
-    </parallel>
-    <snmp>
-      <description>hp LaserJet 4300</description>
-    </snmp>
+      <model>hp LaserJet 4350</model>
+    </usb>
   </autodetect>
   <functionality>A</functionality>
   <driver>hplip</driver>
diff -up foomatic-db-20101123/db/source/printer/HP-LaserJet_5100.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-LaserJet_5100.xml
--- foomatic-db-20101123/db/source/printer/HP-LaserJet_5100.xml.device-ids-20101202	2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-LaserJet_5100.xml	2010-12-02 16:00:22.000000000 +0100
@@ -19,6 +19,13 @@
       <charset>us-ascii</charset>
     </text>
   </lang>
+  <autodetect>
+    <usb>
+      <commandset>PJL,MLC,PCL,PCLXL,POSTSCRIPT</commandset>
+      <manufacturer>Hewlett-Packard</manufacturer>
+      <model>HP LaserJet 5100 Series</model>
+    </usb>
+  </autodetect>
   <functionality>A</functionality>
   <driver>hplip</driver>
   <drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-LaserJet_8000.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-LaserJet_8000.xml
--- foomatic-db-20101123/db/source/printer/HP-LaserJet_8000.xml.device-ids-20101202	2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-LaserJet_8000.xml	2010-12-02 16:00:22.000000000 +0100
@@ -18,6 +18,13 @@
       <charset>us-ascii</charset>
     </text>
   </lang>
+  <autodetect>
+    <usb>
+      <commandset>PJL,MLC,PCL,PCLXL,POSTSCRIPT</commandset>
+      <manufacturer>Hewlett-Packard</manufacturer>
+      <model>HP LaserJet 8000 Series</model>
+    </usb>
+  </autodetect>
   <functionality>A</functionality>
   <driver>hplip</driver>
   <drivers>
diff -up foomatic-db-20101123/db/source/printer/HP-LaserJet_P3005.xml.device-ids-20101202 foomatic-db-20101123/db/source/printer/HP-LaserJet_P3005.xml
--- foomatic-db-20101123/db/source/printer/HP-LaserJet_P3005.xml.device-ids-20101202	2010-12-02 16:00:20.000000000 +0100
+++ foomatic-db-20101123/db/source/printer/HP-LaserJet_P3005.xml	2010-12-02 16:00:22.000000000 +0100
@@ -20,12 +20,12 @@
     </text>
   </lang>
   <autodetect>
-    <general>
-      <commandset>PJL,MLC,BIDI-ECP,PCL,POSTSCRIP</commandset>
+    <usb>
+      <commandset>PJL,MLC,BIDI-ECP,POSTSCRIPT,PJL,PCLXL,PCL</commandset>
       <description>Hewlett-Packard LaserJet P3005 Series</description>
       <manufacturer>Hewlett-Packard</manufacturer>
-      <model>HP LaserJet P3005 Series</model>
-    </general>
+      <model>HP LaserJet P3005</model>
+    </usb>
   </autodetect>
   <functionality>A</functionality>
   <driver>hplip</driver>