diff --git a/smartmontools/CHANGELOG b/smartmontools/CHANGELOG
index 8fce2465033acfb77a81cdf7859343eddd58a641..b132dd3b26ab86da177a6f7fa50b334766be9aa5 100644
--- a/smartmontools/CHANGELOG
+++ b/smartmontools/CHANGELOG
@@ -43,6 +43,13 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
+  [MS] drivedb.h updates:
+       - SAMSUNG SpinPoint F3 series
+       - SAMSUNG SpinPoint F3 EG series
+       - SAMSUNG SpinPoint M5 series
+       - Western Digital Caviar Green 6400AADS
+       - more Western Digital VelociRaptor variants
+
   [AS] FreeBSD: disable 48-bit commands in the ata_pass_through interface, 
        there is no 48-bit support in the IOCATAREQUEST ioctl.
 
diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index 60f320b6d1625ec961da282e4adf4a123d79e6c3..89237a2acd94ed2c86342617fbe55881818e701f 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -409,6 +409,14 @@ const drive_settings builtin_knowndrives[] = {
     "SAMSUNG HD(502H|10[23]S|15[34]U)I",
     "", "", ""
   },
+  { "SAMSUNG SpinPoint F3 series", // tested with HD502HJ/1AJ100E4
+    "SAMSUNG HD(502H|754J|103S)J",
+    "", "", ""
+  },
+  { "SAMSUNG SpinPoint F3 EG series", // tested with HD503HI/1AJ100E4
+    "SAMSUNG HD(253G|(324|503)H|754J|105S)I",
+    "", "", ""
+  },
   { "SAMSUNG SpinPoint S250 series", // tested with HD200HJ/KF100-06
     "SAMSUNG HD(162|200|250)HJ",
     "", "", ""
@@ -476,6 +484,10 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-v 9,halfminutes"
   },
+  { "SAMSUNG SpinPoint M5 series", // tested with HM160HI/HH100-12
+    "SAMSUNG HM((061|080)G|(121|160)H|250J)I",
+    "", "", ""
+  },
 /*
   // TODO: Make the entries below more specific.
   // These entries produce misleading results, because newer
@@ -1337,7 +1349,7 @@ const drive_settings builtin_knowndrives[] = {
     "", "", ""
   },
   { "Western Digital Caviar Green family",
-    "WDC WD((50|64|75)00AA(C|V)S|(50|75)00AADS|10EA(C|V)S|(10|15|20)EADS)-.*",
+    "WDC WD((50|64|75)00AA(C|V)S|(50|64|75)00AADS|10EA(C|V)S|(10|15|20)EADS)-.*",
     "", "", ""
   },
   { "Western Digital Caviar Black family",
@@ -1361,7 +1373,7 @@ const drive_settings builtin_knowndrives[] = {
     "", "", ""
   },
   { "Western Digital VelociRaptor family",
-    "WDC WD((1500|3000)B|3000G)LFS-.*",
+    "WDC WD(800H|(1500|3000)[BH]|1600H|3000G)LFS-.*",
     "", "", ""
   },
   { "Western Digital Scorpio EIDE family",