diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index faa571a237a6488a86a75865d0c96b63e5244279..c55223b5a9e6ea6d21b64ece2aae9724b18a8f47 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
 CHANGELOG for smartmontools
 
-$Id: CHANGELOG,v 1.566 2006/09/27 21:42:03 chrfranke Exp $
+$Id: CHANGELOG,v 1.567 2006/10/08 22:36:38 pjwilliams Exp $
 
 The most recent version of this file is:
 http://smartmontools.cvs.sourceforge.net/smartmontools/sm5/CHANGELOG?view=markup
@@ -33,6 +33,15 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
+  [PW] Drive database: added Maxtor MaXLine III family, Seagate U7
+       family, Seagate ST34321A, FUJITSU MHM2060AT, FUJITSU MHT2040AS,
+       Western Digital Caviar SE16 family, IBM Travelstar 4GT family,
+       QUANTUM FIREBALLP KA9.1, QUANTUM FIREBALL SE4.3A, TOSHIBA
+       MK1032GAX, TOSHIBA MK4026GAX
+
+  [PW] Drive database: added missing drives from Western Digital Caviar
+       SE (Serial ATA) and WD Raptor families
+
   [CF] Windows: Added support for 3ware 9000 controllers using extended
        SMART functionality in new 3ware driver. This includes DEVICESCAN
        support for at most 2 controllers. Thanks to Greg de Valois from
diff --git a/sm5/knowndrives.cpp b/sm5/knowndrives.cpp
index fafe3cbef5b8eaeaea0e60ff4a1c614857e2ca52..a08024f36bf8011077d09cc8c5aa49086c6f3ee6 100644
--- a/sm5/knowndrives.cpp
+++ b/sm5/knowndrives.cpp
@@ -26,7 +26,7 @@
 #include "knowndrives.h"
 #include "utility.h" // includes <regex.h>
 
-const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.145 2006/10/04 23:04:27 shattered Exp $"
+const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.146 2006/10/08 22:36:38 pjwilliams Exp $"
 ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID KNOWNDRIVES_H_CVSID UTILITY_H_CVSID;
 
 #define MODEL_STRING_LENGTH                         40
@@ -215,8 +215,8 @@ const drivesettings knowndrives[] = {
     vendoropts_Fujitsu_MHS2020AT,
     NULL, NULL
   },
-  { NULL, // Fujitsu MHL2300AT, MHM2200AT, MHM2100AT, MHM2150AT
-    "^FUJITSU MH(L230|M2(20|10|15))0AT$",
+  { NULL, // Fujitsu MHL2300AT, MHM2200AT, MHM2100AT, MHM2150AT, MHM2060AT
+    "^FUJITSU MH(L230|M2(20|10|15|06))0AT$",
     ".*",
     "This drive's firmware has a harmless Drive Identity Structure\n"
       "checksum error bug.",
@@ -230,6 +230,13 @@ const drivesettings knowndrives[] = {
     vendoropts_9_seconds,
     NULL, NULL
   },
+  { NULL, // FUJITSU MHT2040AS
+    "^FUJITSU MHT2040AS$",
+    ".*",
+    NULL,
+    vendoropts_9_seconds,
+    NULL, NULL
+  },
   { NULL, // Samsung SV4012H (known firmware)
     "^SAMSUNG SV4012H$",
     "^RM100-08$",
@@ -535,6 +542,13 @@ const drivesettings knowndrives[] = {
     vendoropts_9_minutes,
     NULL, NULL
   },
+  { "Maxtor MaXLine III family",
+    "^Maxtor 7(V(25|30)0F|L(25|30)0[SR])0$",
+    ".*",
+    NULL,
+    vendoropts_9_minutes,
+    NULL, NULL
+  },
   { NULL, // HITACHI_DK14FA-20B
     "^HITACHI_DK14FA-20B$",
     ".*",
@@ -566,6 +580,11 @@ const drivesettings knowndrives[] = {
     ".*",
     NULL, NULL, NULL, NULL
   },
+  { "IBM Travelstar 4GT family",
+    "^IBM-DTCA-2(324|409)0$",
+    ".*",
+    NULL, NULL, NULL, NULL 
+  },
   { "IBM Travelstar 25GS, 18GT, and 12GN family",
     "^IBM-DARA-2(25|18|15|12|09|06)000$",
     ".*",
@@ -662,7 +681,7 @@ const drivesettings knowndrives[] = {
     NULL, NULL, NULL, NULL
   },
   { "Toshiba 2.5\" HDD series", // TOSHIBA MK6021GAS [Bruce -- use for testing on laptop]
-    "^TOSHIBA MK6021GAS$",
+    "^TOSHIBA MK((1032|4026)GAX|6021GAS)$",
     ".*",
     NULL, NULL, NULL, NULL
   },
@@ -721,8 +740,8 @@ const drivesettings knowndrives[] = {
     ".*",
     NULL, NULL, NULL, NULL
   },
-  { "Seagate Medalist 8641 family",
-    "^ST3(2110|3221|4312|6531|8641)A$",
+  { "Seagate Medalist 2110, 3221, 4321, 6531, and 8641",
+    "^ST3(2110|3221|4321|6531|8641)A$",
     ".*",
     NULL, NULL, NULL, NULL
   },
@@ -731,6 +750,11 @@ const drivesettings knowndrives[] = {
     ".*",
     NULL, NULL, NULL, NULL
   },
+  { "Seagate U7 family",
+    "^ST3(30012|40012|60012|80022|120020)A$",
+    ".*",
+    NULL, NULL, NULL, NULL
+  },
   { "Seagate U Series 6 family",
     "^ST3(8002|6002|4081|3061|2041)0A$",
     ".*",
@@ -873,7 +897,12 @@ const drivesettings knowndrives[] = {
     NULL, NULL, NULL, NULL
   },
   { "Western Digital Caviar SE (Serial ATA) family",
-    "^WDC WD(4|8|12|16|20|25)00JD-.*$",
+    "^WDC WD((4|8|12|16|20|25)00JD|(12|16|20|25|30|32)00JS|1600AAJS)-.*$",
+    ".*",
+    NULL, NULL, NULL, NULL
+  },
+  { "Western Digital Caviar SE16 family",
+    "^WDC WD((25|32|40|50)00KS|4000KD)-.*$",
     ".*",
     NULL, NULL, NULL, NULL
   },
@@ -883,7 +912,7 @@ const drivesettings knowndrives[] = {
     NULL, NULL, NULL, NULL
   },
   { "Western Digital Raptor family",
-    "^WDC WD(360|740)GD",
+    "^WDC WD((360|740|800)GD|(360|740|1500)ADFD)-.*$",
     ".*",
     NULL, NULL, NULL, NULL
   },
@@ -917,8 +946,8 @@ const drivesettings knowndrives[] = {
     ".*",
     NULL, NULL, NULL, NULL
   },
-  { NULL, // QUANTUM FIREBALLP AS10.2, AS20.5, and AS40.0
-    "^QUANTUM FIREBALLP AS(10.2|20.5|40.0)$",
+  { NULL, // QUANTUM FIREBALLP AS10.2, AS20.5, AS30.0, and AS40.0
+    "^QUANTUM FIREBALLP AS(10.2|20.5|30.0|40.0)$",
     ".*",
     NULL, NULL, NULL, NULL
   },
@@ -942,8 +971,13 @@ const drivesettings knowndrives[] = {
     ".*",
     NULL, NULL, NULL, NULL
   },
-  { NULL, // QUANTUM FIREBALLP KA10.1
-    "^QUANTUM FIREBALLP KA10.1$",
+  { "Quantum Fireball Plus KA series",
+    "^QUANTUM FIREBALLP KA(9|10).1$",
+    ".*",
+    NULL, NULL, NULL, NULL
+  },
+  { "Quantum Fireball SE series",
+    "^QUANTUM FIREBALL SE4.3A$",
     ".*",
     NULL, NULL, NULL, NULL
   },