diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index 8cc842bd866e668c1ec5923e00c1fb10aa1f7932..d327ec9b968df5584d04e5d2558ceae417aa42ed 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
 CHANGELOG for smartmontools
 
-$Id: CHANGELOG,v 1.269 2003/11/26 13:58:00 ballen4705 Exp $
+$Id: CHANGELOG,v 1.270 2003/11/26 20:41:56 pjwilliams Exp $
 
 The most recent version of this file is:
 http://cvs.sourceforge.net/viewcvs.py/smartmontools/sm5/CHANGELOG?sortby=date&view=markup
@@ -24,6 +24,8 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 <ADDITIONS TO THE CHANGE LOG SHOULD BE ADDED JUST BELOW HERE, PLEASE>
 
+  [PW] Removed warning for SAMSUNG SP1213N with firmware TL100-23
+
   [BA] incorporated SuSE init script from user.
 
   [DG] if SCSI device is read only, then open it read only.
diff --git a/sm5/knowndrives.c b/sm5/knowndrives.c
index f989a19bc1ad3c30507b6ab5e933251059ac40a2..8d21aac310b4e0087543af0f422add52139018ec 100644
--- a/sm5/knowndrives.c
+++ b/sm5/knowndrives.c
@@ -27,7 +27,7 @@
 #include "utility.h"
 #include "config.h"
 
-const char *knowndrives_c_cvsid="$Id: knowndrives.c,v 1.57 2003/11/16 22:49:14 pjwilliams Exp $"
+const char *knowndrives_c_cvsid="$Id: knowndrives.c,v 1.58 2003/11/26 20:41:56 pjwilliams Exp $"
                                 ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID KNOWNDRIVES_H_CVSID UTILITY_H_CVSID;
 
 #define MODEL_STRING_LENGTH                         40
@@ -191,7 +191,15 @@ const drivesettings knowndrives[] = {
     specialpurpose_reverse_samsung,
     same_as_minus_F
   },
-  { // Samsung SV4012H (match revision *-23 firmware)
+  { // SAMSUNG SP1213N (TL100-23 firmware)
+    "^SAMSUNG SP1213N$",
+    "^TL100-23$",
+    NULL,
+    vendoropts_Samsung_SV4012H,
+    specialpurpose_reverse_samsung2,
+    same_as_minus_F2
+  },
+  { // Any other Samsung disk with *-23 firmware
     "^SAMSUNG .*$",
     ".*-23$",
     may_need_minus_F2_disabled,
diff --git a/sm5/knowndrives.cpp b/sm5/knowndrives.cpp
index 9ac0dc0e27774db72a225a96f8dcdda23312182c..406ee9dcfbf8720aa46611f7613b9d5f0d4e58c1 100644
--- a/sm5/knowndrives.cpp
+++ b/sm5/knowndrives.cpp
@@ -27,7 +27,7 @@
 #include "utility.h"
 #include "config.h"
 
-const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.57 2003/11/16 22:49:14 pjwilliams Exp $"
+const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.58 2003/11/26 20:41:56 pjwilliams Exp $"
                                 ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID KNOWNDRIVES_H_CVSID UTILITY_H_CVSID;
 
 #define MODEL_STRING_LENGTH                         40
@@ -191,7 +191,15 @@ const drivesettings knowndrives[] = {
     specialpurpose_reverse_samsung,
     same_as_minus_F
   },
-  { // Samsung SV4012H (match revision *-23 firmware)
+  { // SAMSUNG SP1213N (TL100-23 firmware)
+    "^SAMSUNG SP1213N$",
+    "^TL100-23$",
+    NULL,
+    vendoropts_Samsung_SV4012H,
+    specialpurpose_reverse_samsung2,
+    same_as_minus_F2
+  },
+  { // Any other Samsung disk with *-23 firmware
     "^SAMSUNG .*$",
     ".*-23$",
     may_need_minus_F2_disabled,