diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index 78d9be98f056b347d317dd9ec2fb878c2c286c95..63a678e8f0b1dc4f67c8c7a939974f67bfbc9aeb 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
 CHANGELOG for smartmontools
 
-$Id: CHANGELOG,v 1.649 2008/01/29 18:36:20 chrfranke Exp $
+$Id: CHANGELOG,v 1.650 2008/01/29 18:52:17 chrfranke Exp $
 
 The most recent version of this file is:
 http://smartmontools.cvs.sourceforge.net/smartmontools/sm5/CHANGELOG?view=markup
@@ -34,6 +34,8 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
+  [CF] Drive database: Added Samsung P80 series with *-25 firmware.
+
   [CF] Replaced 'head [-n] -1' by 'sed 1...' in autogen.sh to avoid
        portability issues.
 
diff --git a/sm5/knowndrives.cpp b/sm5/knowndrives.cpp
index fe4dc90ad0cfbcffb78e324e0e5750c77a6b883a..428270187922d20327ea45e5db2235b2244bc388 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.163 2008/01/26 09:33:37 shattered Exp $"
+const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.164 2008/01/29 18:52:17 chrfranke 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
@@ -400,9 +400,9 @@ const drivesettings knowndrives[] = {
     may_need_minus_F3_enabled,
     NULL, NULL, NULL
   },
-  { "SAMSUNG SpinPoint P80 series", // firmware *-26...34, tested with SP1614C/SW100-34
+  { "SAMSUNG SpinPoint P80 series", // firmware *-25...34, tested with SP1614C/SW100-25 and -34
     "^SAMSUNG SP(0451|08[0124]2|12[0145]3|16[0145]4)[CN]$",
-    ".*-(2[6789]|3[0-4])$",
+    ".*-(2[5-9]|3[0-4])$",
     NULL,
     vendoropts_9_halfminutes,
     NULL, NULL