diff --git a/sm5/smartd.c b/sm5/smartd.c
index f5358b8a21286e7982b91dba614e08ec6040246d..ad3e6af9226f9eda80e28a008eabc7a9d86e9cea 100644
--- a/sm5/smartd.c
+++ b/sm5/smartd.c
@@ -69,7 +69,7 @@
 extern const char *atacmdnames_c_cvsid, *atacmds_c_cvsid, *ataprint_c_cvsid, *escalade_c_cvsid, 
                   *knowndrives_c_cvsid, *os_XXXX_c_cvsid, *scsicmds_c_cvsid, *utility_c_cvsid;
 
-const char *smartd_c_cvsid="$Id: smartd.c,v 1.261 2003/12/09 21:19:48 ballen4705 Exp $" 
+const char *smartd_c_cvsid="$Id: smartd.c,v 1.262 2003/12/09 21:25:08 ballen4705 Exp $" 
                             ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID KNOWNDRIVES_H_CVSID
                             SCSICMDS_H_CVSID SMARTD_H_CVSID UTILITY_H_CVSID; 
 
@@ -1450,15 +1450,20 @@ int DoSCSISelfTest(int fd, cfgfile *cfg, char testtype) {
         (SIMPLE_ERR_BAD_FIELD == retval)) {
       PrintOut(LOG_CRIT, "Device: %s, not capable of %s-Test\n", name, 
                testname);
+      if ('L'==testtype)
+	cfg->testdata->not_cap_long=1;
+      else
+	cfg->testdata->not_cap_short=1;
+     
       return 1;
     }
     PrintOut(LOG_CRIT, "Device: %s, execute %s-Test failed (err: %d)\n", name, 
              testname, retval);
     return 1;
   }
-
+  
   PrintOut(LOG_INFO, "Device: %s, starting scheduled %s-Test.\n", name, testname);
-
+  
   return 0;
 }
 
diff --git a/sm5/smartd.cpp b/sm5/smartd.cpp
index f1ca3742a027dc85b638dc830fc386eda3de777e..2a360a650fb7feee6cd8bb7bd57cf661bff70dbf 100644
--- a/sm5/smartd.cpp
+++ b/sm5/smartd.cpp
@@ -69,7 +69,7 @@
 extern const char *atacmdnames_c_cvsid, *atacmds_c_cvsid, *ataprint_c_cvsid, *escalade_c_cvsid, 
                   *knowndrives_c_cvsid, *os_XXXX_c_cvsid, *scsicmds_c_cvsid, *utility_c_cvsid;
 
-const char *smartd_c_cvsid="$Id: smartd.cpp,v 1.261 2003/12/09 21:19:48 ballen4705 Exp $" 
+const char *smartd_c_cvsid="$Id: smartd.cpp,v 1.262 2003/12/09 21:25:08 ballen4705 Exp $" 
                             ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID KNOWNDRIVES_H_CVSID
                             SCSICMDS_H_CVSID SMARTD_H_CVSID UTILITY_H_CVSID; 
 
@@ -1450,15 +1450,20 @@ int DoSCSISelfTest(int fd, cfgfile *cfg, char testtype) {
         (SIMPLE_ERR_BAD_FIELD == retval)) {
       PrintOut(LOG_CRIT, "Device: %s, not capable of %s-Test\n", name, 
                testname);
+      if ('L'==testtype)
+	cfg->testdata->not_cap_long=1;
+      else
+	cfg->testdata->not_cap_short=1;
+     
       return 1;
     }
     PrintOut(LOG_CRIT, "Device: %s, execute %s-Test failed (err: %d)\n", name, 
              testname, retval);
     return 1;
   }
-
+  
   PrintOut(LOG_INFO, "Device: %s, starting scheduled %s-Test.\n", name, testname);
-
+  
   return 0;
 }