diff --git a/smartmontools/CHANGELOG b/smartmontools/CHANGELOG
index b976b02ad7b97194baa9c39f608dcd036c43841e..c4bef0be40ab5cbf15551b2cdbe51172cd8c06e7 100644
--- a/smartmontools/CHANGELOG
+++ b/smartmontools/CHANGELOG
@@ -43,6 +43,11 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
+  [MS] attributes updates:
+       - attributes 225, 232 and 233 for Intel X25-E SSD
+       - non-conflicting attributes extracted from wdidle3.exe
+         (thanks to Franc Zabkar and Dan Lukes)
+
   [CF] Update Windows and ./configure info in INSTALL file.
 
   [CF] Update 'do_release' script for SVN.
diff --git a/smartmontools/atacmds.cpp b/smartmontools/atacmds.cpp
index dbb9aa0c4971804997e2c251770f1a6170a8a0df..f1cf9d6a9173a12250b67c8468a1d188d03f58fa 100644
--- a/smartmontools/atacmds.cpp
+++ b/smartmontools/atacmds.cpp
@@ -179,6 +179,7 @@ const vendor_attr_arg_entry vendor_attribute_args[] = {
   {200,"writeerrorcount", 1},
   {201,"detectedtacount", 1},
   {220,"temp", 1},
+  {225,"hostwritescount", 1},
   {  0,"raw8", 253},
   {  0,"raw16", 254},
   {  0,"raw48", 255},
@@ -2184,7 +2185,15 @@ void ataPrintSmartAttribName(char * out, unsigned char id, const unsigned char *
     name="Load_Friction";
     break;
   case 225:
-    name="Load_Cycle_Count";
+    switch (val) {
+    case 1:
+      // seen in Intel X25-E SSD
+      name="Host_Writes_Count";
+      break;
+    default:
+      name="Load_Cycle_Count";
+      break;
+    }
     break;
   case 226:
     name="Load-in_Time";
@@ -2202,12 +2211,29 @@ void ataPrintSmartAttribName(char * out, unsigned char id, const unsigned char *
   case 231:
     name="Temperature_Celsius";
     break;
+  case 232:
+    // seen in Intel X25-E SSD
+    name="Available_Reserved_Space";
+    break;
+  case 233:
+    // seen in Intel X25-E SSD
+    name="Media_Wearout_Indicator";
+    break;
   case 240:
     name="Head_Flying_Hours";
     break;
+  case 241:
+    name="Total_LBAs_Written";
+    break;
+  case 242:
+    name="Total_LBAs_Read";
+    break;
   case 250:
     name="Read_Error_Retry_Rate";
     break;
+  case 254:
+    name="Free_Fall_Sensor";
+    break;
   default:
     name="Unknown_Attribute";
     break;
diff --git a/smartmontools/knowndrives.cpp b/smartmontools/knowndrives.cpp
index cc15cc749a7b81aae17b7db26e1ce775958bae49..5b3220a77d1588fc66b8d6f615e7602fa8fadb38 100644
--- a/smartmontools/knowndrives.cpp
+++ b/smartmontools/knowndrives.cpp
@@ -75,7 +75,8 @@ static const drive_settings builtin_knowndrives[] = {
   },
   { "Intel X25-E SSD",
     "SSDSA2SH(032|064)G1.* INTEL",
-    "", "", ""
+    "", "",
+    "-v 225,hostwritescount"
   },
   { "Transcend Solid-State Drive",
     "TS(8|16|32|64|128)GSSD25-(M|S)",