diff --git a/smartmontools/CHANGELOG b/smartmontools/CHANGELOG
index 8dbcf7b165b349d6992ebceb007457ac68025830..4ae0848862245a4f466bb0783d3664692063ef16 100644
--- a/smartmontools/CHANGELOG
+++ b/smartmontools/CHANGELOG
@@ -43,6 +43,8 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
+  [CF] Add names for attributes 184 and 188, see ticket #17.
+
   [CF] configure.in: Change configure date syntax.
        Add message to '-mno-cygwin' option check.
 
diff --git a/smartmontools/atacmds.cpp b/smartmontools/atacmds.cpp
index 5b9d1f5e7945f54e351f18a00ef35418b9a1cff9..dbb9aa0c4971804997e2c251770f1a6170a8a0df 100644
--- a/smartmontools/atacmds.cpp
+++ b/smartmontools/atacmds.cpp
@@ -2012,9 +2012,15 @@ void ataPrintSmartAttribName(char * out, unsigned char id, const unsigned char *
   case 183:
     name="Runtime_Bad_Block";
     break;
+  case 184:
+    name="End-to-End_Error";
+    break;
   case 187:
     name="Reported_Uncorrect";
     break;
+  case 188:
+    name="Command_Timeout";
+    break;
   case 189:
     name="High_Fly_Writes";
     break;