diff --git a/smartmontools/CHANGELOG b/smartmontools/CHANGELOG
index 107c228cc89d86e90515c227f37baa4ed5f7c1ed..90e409da70042c68bcc90d5e4f3fad96854bf3f3 100644
--- a/smartmontools/CHANGELOG
+++ b/smartmontools/CHANGELOG
@@ -43,6 +43,9 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
+  [CF] drivedb.h update:
+       - SAMSUNG SpinPoint M40/60/80 series
+
   [CF] Add direct access to 48-bit LBA register in 'ata_in/out_regs_48bit'.
 
   [DL] drivedb.h updates:
diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index 3b76a72176d4362f6671ae297a89f74cd3ca76d9..9d84bb5f9315ceab3cb11424de7a4526f32c7edb 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -415,6 +415,12 @@ const drive_settings builtin_knowndrives[] = {
     "May need -F samsung2 or -F samsung3 enabled; see manual for details.",
     ""
   },
+  { "SAMSUNG SpinPoint M40/60/80 series", // tested with HM160JI/AD100-16
+    "SAMSUNG HM(0[468]0H|1[026]0J)[CI]",
+    "",
+    "",
+    "-v 9,halfminutes"
+  },
 /*
   // TODO: Make the entries below more specific.
   // These entries produce misleading results, because newer