diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index 996255f4edd5db62f8ffe22e754e57d584eba91d..c65e0b89ba1320c992c86c9b568ee1c95c6e6328 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
 CHANGELOG for smartmontools
 
-$Id: CHANGELOG,v 1.614 2007/05/13 14:33:33 guidog Exp $
+$Id: CHANGELOG,v 1.615 2007/05/30 19:29:40 chrfranke Exp $
 
 The most recent version of this file is:
 http://smartmontools.cvs.sourceforge.net/smartmontools/sm5/CHANGELOG?view=markup
@@ -33,6 +33,9 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
+  [CF] Added message text for ATA-7 self-test execution status 8
+       ("... handling damage").
+
   [GG] cciss: support more than 16 disks (patch taken from
        http://cciss.sourceforge.net/smartmontools_cciss_more_than_16_drives.patch
        and adjusted for smartd)
diff --git a/sm5/ataprint.cpp b/sm5/ataprint.cpp
index f402d1357cb711409b1118ac8251af5cf9525a09..1c837630b9deb4bbe912663085c3edc3d549c44e 100644
--- a/sm5/ataprint.cpp
+++ b/sm5/ataprint.cpp
@@ -41,7 +41,7 @@
 #include "utility.h"
 #include "knowndrives.h"
 
-const char *ataprint_c_cvsid="$Id: ataprint.cpp,v 1.180 2007/04/14 08:57:47 shattered Exp $"
+const char *ataprint_c_cvsid="$Id: ataprint.cpp,v 1.181 2007/05/30 19:29:40 chrfranke Exp $"
 ATACMDNAMES_H_CVSID ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID KNOWNDRIVES_H_CVSID SMARTCTL_H_CVSID UTILITY_H_CVSID;
 
 // for passing global control variables
@@ -687,6 +687,13 @@ void PrintSmartSelfExecStatus(struct ata_smart_values *data)
                   (int)data->self_test_exec_status);
           pout("the read element of the test failed.\n");
           break;
+       case 8:
+          pout("(%4d)\tThe previous self-test completed having\n\t\t\t\t\t",
+                  (int)data->self_test_exec_status);
+          pout("a test element that failed and the\n\t\t\t\t\t");
+          pout("device is suspected of having handling\n\t\t\t\t\t");
+          pout("damage.\n");
+          break;
        case 15:
           if (con->fixfirmwarebug == FIX_SAMSUNG3 && data->self_test_exec_status == 0xf0) {
             pout("(%4d)\tThe previous self-test routine completed\n\t\t\t\t\t",