diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index f7958908d68616942086633fda28b8f30bf40ebd..8e3d379db4ea9f1c108bc2cee0041ac1f6621654 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
 CHANGELOG for smartmontools
 
-$Id: CHANGELOG,v 1.490 2004/11/08 01:32:14 dpgilbert Exp $
+$Id: CHANGELOG,v 1.491 2004/11/10 22:09:53 pjwilliams Exp $
 
 The most recent version of this file is:
 http://cvs.sourceforge.net/viewcvs.py/smartmontools/sm5/CHANGELOG?sortby=date&view=markup
@@ -31,6 +31,10 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 <ADDITIONS TO THE CHANGE LOG SHOULD BE ADDED JUST BELOW HERE, PLEASE>
 
+  [PW] Added Seagate U4 family, Fujitsu MHJ and MHK families, Seagate
+       Barracuda 5400.1, QUANTUM FIREBALLP KX27.3, QUANTUM FIREBALLP KA10.1,
+       and ExcelStor J340 to knowndrives table.
+
   [DG] [SCSI] After report of Hitachi IC35L073UCDY10 disks locking up
        on log page 0x7 (last n error events), check log page (and some
        others) is supported (via log page 0x0) before probing.
diff --git a/sm5/knowndrives.c b/sm5/knowndrives.c
index 4884cccfcba7f3b43322b032b2033274f201bc57..3cf521415d7386447fc550aa7f100383fe6ea40a 100644
--- a/sm5/knowndrives.c
+++ b/sm5/knowndrives.c
@@ -26,7 +26,7 @@
 #include "knowndrives.h"
 #include "utility.h" // includes <regex.h>
 
-const char *knowndrives_c_cvsid="$Id: knowndrives.c,v 1.129 2004/10/12 21:51:41 pjwilliams Exp $"
+const char *knowndrives_c_cvsid="$Id: knowndrives.c,v 1.130 2004/11/10 22:09:53 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
@@ -173,6 +173,18 @@ const drivesettings knowndrives[] = {
     ".*",
     NULL, NULL, NULL, NULL
   },
+  { NULL, // ExcelStor J340
+    "^ExcelStor Technology J340$",
+    ".*",
+    NULL, NULL, NULL, NULL
+  },
+  { "Fujitsu MHJ and MHK series",
+    "^FUJITSU MH[JK]....ATU?$",
+    ".*",
+    NULL,
+    vendoropts_9_seconds,
+    NULL, NULL
+  },
   { "Fujitsu MPB series",
     "^FUJITSU MPB....ATU?$",
     ".*",
@@ -691,6 +703,11 @@ const drivesettings knowndrives[] = {
     ".*",
     NULL, NULL, NULL, NULL
   },
+  { "Seagate U4 family",
+    "^ST3(2112|4311|6421|8421)A$",
+    ".*",
+    NULL, NULL, NULL, NULL
+  },
   { "Seagate U8 family",
     "^ST3(8410|4313|17221|13021)A$",
     ".*",
@@ -721,6 +738,11 @@ const drivesettings knowndrives[] = {
     ".*",
     NULL, NULL, NULL, NULL
   },
+  { "Seagate Barracuda 5400.1",
+    "^ST340015A$",
+    ".*",
+    NULL, NULL, NULL, NULL
+  },
   { "Seagate Barracuda 7200.7 and 7200.7 Plus family",
     "^ST3(200822AS?|16002[13]AS?|12002[26]AS?|8001[13]AS?|60014A|40014AS?)$",
     ".*",
@@ -856,6 +878,16 @@ const drivesettings knowndrives[] = {
     ".*",
     NULL, NULL, NULL, NULL
   },
+  { NULL, // QUANTUM FIREBALLP KX27.3
+    "^QUANTUM FIREBALLP KX27.3$",
+    ".*",
+    NULL, NULL, NULL, NULL
+  },
+  { NULL, // QUANTUM FIREBALLP KA10.1
+    "^QUANTUM FIREBALLP KA10.1$",
+    ".*",
+    NULL, NULL, NULL, NULL
+  },
   /*------------------------------------------------------------
    *  End of table.  Do not add entries below this marker.
    *------------------------------------------------------------ */
diff --git a/sm5/knowndrives.cpp b/sm5/knowndrives.cpp
index 7600397ad7916e05546d0160eeefc586ad32c840..0eead5d245aabb25f1df798323040ee38c36edee 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.129 2004/10/12 21:51:41 pjwilliams Exp $"
+const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.130 2004/11/10 22:09:53 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
@@ -173,6 +173,18 @@ const drivesettings knowndrives[] = {
     ".*",
     NULL, NULL, NULL, NULL
   },
+  { NULL, // ExcelStor J340
+    "^ExcelStor Technology J340$",
+    ".*",
+    NULL, NULL, NULL, NULL
+  },
+  { "Fujitsu MHJ and MHK series",
+    "^FUJITSU MH[JK]....ATU?$",
+    ".*",
+    NULL,
+    vendoropts_9_seconds,
+    NULL, NULL
+  },
   { "Fujitsu MPB series",
     "^FUJITSU MPB....ATU?$",
     ".*",
@@ -691,6 +703,11 @@ const drivesettings knowndrives[] = {
     ".*",
     NULL, NULL, NULL, NULL
   },
+  { "Seagate U4 family",
+    "^ST3(2112|4311|6421|8421)A$",
+    ".*",
+    NULL, NULL, NULL, NULL
+  },
   { "Seagate U8 family",
     "^ST3(8410|4313|17221|13021)A$",
     ".*",
@@ -721,6 +738,11 @@ const drivesettings knowndrives[] = {
     ".*",
     NULL, NULL, NULL, NULL
   },
+  { "Seagate Barracuda 5400.1",
+    "^ST340015A$",
+    ".*",
+    NULL, NULL, NULL, NULL
+  },
   { "Seagate Barracuda 7200.7 and 7200.7 Plus family",
     "^ST3(200822AS?|16002[13]AS?|12002[26]AS?|8001[13]AS?|60014A|40014AS?)$",
     ".*",
@@ -856,6 +878,16 @@ const drivesettings knowndrives[] = {
     ".*",
     NULL, NULL, NULL, NULL
   },
+  { NULL, // QUANTUM FIREBALLP KX27.3
+    "^QUANTUM FIREBALLP KX27.3$",
+    ".*",
+    NULL, NULL, NULL, NULL
+  },
+  { NULL, // QUANTUM FIREBALLP KA10.1
+    "^QUANTUM FIREBALLP KA10.1$",
+    ".*",
+    NULL, NULL, NULL, NULL
+  },
   /*------------------------------------------------------------
    *  End of table.  Do not add entries below this marker.
    *------------------------------------------------------------ */