diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index bb13d15146c3d36ace1a40d5f4a0c5dcf6c8050a..ef3512114b10be56a217cd13f26a40443c0b8c19 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
 CHANGELOG for smartmontools
 
-$Id: CHANGELOG,v 1.281 2003/12/06 12:59:14 pjwilliams Exp $
+$Id: CHANGELOG,v 1.282 2003/12/06 16:31:57 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 SP0802N with TK100-23 firmware
+
   [PW] Added Seagate Barracuda ATA IV family to knowndrives table.
 
   [BA] smartd: reduce per-device memory footprint by making
diff --git a/sm5/knowndrives.c b/sm5/knowndrives.c
index dea2911d553b85057243baa97410a2f892d85417..02681693aac703fccbd3454b8dda24fb3496d3a9 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.59 2003/12/06 12:59:14 pjwilliams Exp $"
+const char *knowndrives_c_cvsid="$Id: knowndrives.c,v 1.60 2003/12/06 16:31:57 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
@@ -199,6 +199,14 @@ const drivesettings knowndrives[] = {
     specialpurpose_reverse_samsung2,
     same_as_minus_F2
   },
+  { // SAMSUNG SP0802N (TK100-23 firmware)
+    "^SAMSUNG SP0802N$",
+    "^TK100-23$",
+    NULL,
+    vendoropts_Samsung_SV4012H,
+    specialpurpose_reverse_samsung2,
+    same_as_minus_F2
+  },
   { // Any other Samsung disk with *-23 firmware
     "^SAMSUNG .*$",
     ".*-23$",
diff --git a/sm5/knowndrives.cpp b/sm5/knowndrives.cpp
index 25039dd028aa37c15166ee1d5b459a95bd396cbc..958b38551a658c34e9ab9cdf604d6803aacc3fc0 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.59 2003/12/06 12:59:14 pjwilliams Exp $"
+const char *knowndrives_c_cvsid="$Id: knowndrives.cpp,v 1.60 2003/12/06 16:31:57 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
@@ -199,6 +199,14 @@ const drivesettings knowndrives[] = {
     specialpurpose_reverse_samsung2,
     same_as_minus_F2
   },
+  { // SAMSUNG SP0802N (TK100-23 firmware)
+    "^SAMSUNG SP0802N$",
+    "^TK100-23$",
+    NULL,
+    vendoropts_Samsung_SV4012H,
+    specialpurpose_reverse_samsung2,
+    same_as_minus_F2
+  },
   { // Any other Samsung disk with *-23 firmware
     "^SAMSUNG .*$",
     ".*-23$",