diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index cb8ae44e1c5458511cc7c738f5da14261ae2f727..087576fc7b7ce666b625cfdd8036c326b87d0e22 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
 CHANGELOG for smartmontools
 
-$Id: CHANGELOG,v 1.752 2008/11/16 19:00:30 manfred99 Exp $
+$Id: CHANGELOG,v 1.753 2008/11/30 22:35:49 manfred99 Exp $
 
 The most recent version of this file is:
 http://smartmontools.cvs.sourceforge.net/smartmontools/sm5/CHANGELOG?view=markup
@@ -40,6 +40,10 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
+  [MS] knowndrives.cpp updates:
+       - Added remaining Seagate Barracuda 7200.11 drives
+       - Added HP 1TB SATA disk
+
   [MS] knowndrives.cpp updates:
        - Added Maxtor 92040U6 (DiamondMax Plus 6800)
        - Added Seagate Maxtor DiamondMax 21 500GB version
diff --git a/sm5/knowndrives.cpp b/sm5/knowndrives.cpp
index 123ef62e4109ee7c3ffd552776166f7d20497526..0f227a8f20a89ba0da0827afb7f2af0a0e738a78 100644
--- a/sm5/knowndrives.cpp
+++ b/sm5/knowndrives.cpp
@@ -35,7 +35,7 @@
 
 #include <stdexcept>
 
-const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.187 2008/11/16 19:00:30 manfred99 Exp $"
+const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.188 2008/11/30 22:35:49 manfred99 Exp $"
 ATACMDS_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID KNOWNDRIVES_H_CVSID UTILITY_H_CVSID;
 
 #define MODEL_STRING_LENGTH                         40
@@ -65,6 +65,10 @@ static const drive_settings builtin_knowndrives[] = {
     "ASUS-PHISON SSD",
     "", "", ""
   },
+  { "HP 1TB SATA disk GB1000EAFJL",
+    "GB1000EAFJL",
+    "", "", ""
+  },
   { "IBM Deskstar 60GXP series",  // ER60A46A firmware
     "(IBM-|Hitachi )?IC35L0[12346]0AVER07.*",
     "ER60A46A",
@@ -890,8 +894,8 @@ static const drive_settings builtin_knowndrives[] = {
     "ST3((80|160)[28]15|200820|250[34]10|(250|300|320|400)[68]20|500[68]30|750[68]40)AS?",
     "", "", ""
   },
-  { "Seagate Barracuda 7200.11",
-    "ST3(500[368]2|750[36]3|1000[36]4)0AS?",
+  { "Seagate Barracuda 7200.11 family",
+    "ST3(160813|320613|500[368]20|640323|750[36]30|1000(333|[36]40)|1500341)AS?",
     "", "", ""
   },
   { "Seagate Barracuda ES",