diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index 94bc68654fb4f7f6dc9f89fec7ea28b18445944c..d908b8b5dce1c288cd21e5c037cd4aec6044d8d4 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -1217,11 +1217,12 @@ const drive_settings builtin_knowndrives[] = {
     "-v 242,raw48,Host_Reads_32MiB "
     "-v 249,raw48,NAND_Writes_1GiB"
   },
-  { "Intel 53x and Pro 2500 Series SSDs", // SandForce SF-2281, tested with
+  { "Intel 53x and Pro 1500/2500 Series SSDs", // SandForce SF-2281, tested with
       // INTEL SSDSC2BW180A4/DC12, SSDSC2BW240A4/DC12, SSDMCEAW120A4/DC33
       // INTEL SSDMCEAW240A4/DC33, SSDSC2BF480A5/TG26, SSDSC2BW240H6/RG21
-    "INTEL SSD(MCEA|SC2B|SCKJ)[WF](056|080|120|180|240|360|480)(A4|A5|H6)",
-      // SC2B = 2.5", MCEA = mSATA, SCKJ = M.2; A4 = 530, A5 = Pro 2500, H6 = 535
+      // INTEL SSDSC2BF180A4H/LH6i
+    "INTEL SSD(MCEA|SC2B|SCKJ)[WF](056|080|120|180|240|360|480)(A4H?|A5|H6)",
+      // SC2B = 2.5", MCEA = mSATA, SCKJ = M.2; A4 = 530/Pro 1500, A5 = Pro 2500, H6 = 535
     "", "",
   //"-v 5,raw16(raw16),Reallocated_Sector_Ct "
     "-v 9,msec24hour32,Power_On_Hours_and_Msec "
@@ -1365,6 +1366,35 @@ const drive_settings builtin_knowndrives[] = {
     "-v 228,raw48,Workload_Minutes "
     "-v 249,raw48,NAND_Writes_1GiB "
   },
+  { "Intel DC S3110 Series SSDs", // Tested with INTEL SSDSCKKI256G8
+    "INTEL SSDSCKKI(128|256|512)G8",
+    "", "",
+    //"-v 5,raw16(raw16),Reallocated_Sector_Ct "
+    //"-v 9,raw24(raw8),Power_On_Hours "
+    //"-v 12,raw48,Power_Cycle_Count "
+    "-v 170,raw48,Available_Reservd_Space "
+    "-v 171,raw48,Program_Fail_Count "
+    "-v 172,raw48,Erase_Fail_Count "
+    //"-v 173 is missing in official Intel doc"
+    "-v 174,raw48,Unexpect_Power_Loss_Ct "
+    "-v 183,raw48,SATA_Downshift_Count "
+    //"-v 184,raw48,End-to-End_Error_Count "
+    "-v 187,raw48,Uncorrectable_Error_Cnt "
+    //"-v 190,tempminmax,Airflow_Temperature_Cel "
+    //"-v 192,raw48,Power-Off_Retract_Count "
+    //"-v 199,raw48,UDMA_CRC_Error_Count "
+    "-v 225,raw48,Host_Writes_32MiB "
+    "-v 226,raw48,Workld_Media_Wear_Indic "
+    "-v 227,raw48,Workld_Host_Reads_Perc "
+    "-v 228,raw48,Workload_Minutes "
+    //"-v 232,raw48,Available_Reservd_Space "
+    //"-v 233,raw48,Media_Wearout_Indicator "
+    //"-v 236 is missing in official Intel doc"
+    "-v 241,raw48,Host_Writes_32MiB "
+    "-v 242,raw48,Host_Reads_32MiB "
+    "-v 249,raw48,NAND_Writes_1GiB "
+    //"-v 252 is missing in official Intel doc"
+  },
   { "Intel 3710 Series SSDs", // INTEL SSDSC2BA200G4R/G201DL2B (dell)
     "INTEL SSDSC2BA(200G|400G|800G|012T)4.?",
     "", "",
@@ -4291,15 +4321,17 @@ const drive_settings builtin_knowndrives[] = {
       // WDC WD10JFCX-68N6GN0/01.01A01, WDC WD30EFRX-68EUZN0/82.00A82,
       // WDC WD40EFRX-68WT0N0/80.00A80, WDC WD60EFRX-68MYMN1/82.00A82,
       // WDC WD80EFAX-68LHPN0/83.H0A83, WDC WD80EFZX-68UW8N0/83.H0A83,
-      // WDC WD80EZZX-11CSGA0/83.H0A03 (My Book 0x1058:0x25ee)
-    "WDC WD(7500BFC|10JFC|[1-6]0EFR|80E[FZ][AZ])X-.*",
+      // WDC WD80EZZX-11CSGA0/83.H0A03 (My Book 0x1058:0x25ee),
+      // WDC WD100EFAX-68LHPN0/83.H0A83
+    "WDC WD(7500BFC|10JFC|[1-6]0EFR|80E[FZ][AZ]|100EFA)X-.*",
     "", "",
-    "-v 22,raw48,Helium_Level" // WD80EFZX
+    "-v 22,raw48,Helium_Level" // WD80EFZX, WD100EFAX
   },
   { "Western Digital Red Pro", // tested with WDC WD2001FFSX-68JNUN0/81.00A81,
-      // WDC WD6002FFWX-68TZ4N0/83.H0A83
-    "WDC WD([2-68]00[12])FF[SW]X-.*",
-    "", "", ""
+      // WDC WD6002FFWX-68TZ4N0/83.H0A83, WDC WD101KFBX-68R56N0/83.H0A03
+    "WDC WD([2-68]00[123]FF[BSW]|101KFB)X-.*",
+    "", "",
+    "-v 22,raw48,Helium_Level" // WD101KFBX
   },
   { "Western Digital Purple", // tested with WDC WD40PURX-64GVNY0/80.00A80
     "WDC WD[123456]0PURX-.*",
diff --git a/smartmontools/drivedb.h.raw.asc b/smartmontools/drivedb.h.raw.asc
index 347ebff27225799a053d7a666696ccd748189259..a1621d8cb6672e326cdbb05391e84bcea47681aa 100644
--- a/smartmontools/drivedb.h.raw.asc
+++ b/smartmontools/drivedb.h.raw.asc
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAABAgAGBQJcvdyZAAoJEOp0qyVyEELFS6UP/0uHt/Jj6z8w4E4yFB/I6dMn
-/wh5CYpYzm+RkzM+yF2UpBJK2gL0USzGz3IAYncboN72ehPLyk36tlzJ62BC90ua
-7WI6ZSdfTlmsCQM7Aps16EAsm3IW07oCdJ9wYAGhVK5LR5sumtqPqYJDCpz5DvJP
-bDvsPzYCEnWlWhDXEpLv6Ckd7NsinNXSpmTqMQeHQ7xuLz40NWrSh3rmKjha1aBv
-YunivtbtWmd+Usz/sJPgReEhmMz0g55Ny6exNpM9gJW5zbo8wWdf/OqvkI9Dut86
-33oBVqV/4/i+bh9pE0Uat9fQa8dKk+HGRhj4IwVVqhZX2IMA5Igs0ppS7s6/RCgz
-UGyHA2qqFx8h7d4cqOFIJdzNi55co2p/AEurUHCM9Yucxlr4CPZRbEPJxzJCp0+2
-W4ljpfnn8B9uBNpoEELO3rfQMF1PlUi2FiAfdTf52UblROgBECiSjEgLJib7TJFr
-tfBifHS22P+UXGovqSgaRHTucdq3H3zkLIVc+ZQ5Jqa+7Zb7HZqz8IPs0zkWLBDV
-O2D9X4WO/uDwf4PZxhY45AeBxJsPI6qPDWbcxht3XMkIp9Yp0nnoN+bvlUf8pVqw
-Yyep+twI5YNxjqLrWqlxgyCVlJ8/wu3ZC5ezvt+r1clCO2U9SsmO5KCa+vzfDRfZ
-rVsj6A/RBiSmcYRq9nW3
-=91Pz
+iQIcBAABAgAGBQJc5Fu8AAoJEOp0qyVyEELFktYP/A6vZx7RFZ7wubThSpoqwS+w
+Iywt3ZfB0rHAeAYkEbQUI9Cy6SO3rzEnhamMwNwFplNiJ2bEpzFOApCaJNSxe59U
+rbZfcL1/UAootNFIXw3V31F019YNCOWJrkIGt55ILUbc+YfleIC5rNHH0IIlPDK5
+Ck6DE6gZInQ+tAK8pmOzQEhtoY1hb6rPkVl/zASbYCr7CQL5mTcRMdOSa4BnJMIa
+awNVRx1czu2awLooby5r+TsBJkPEV5SNcDjj2yVWqxO7MvNatLGS3ELNU8W0nV8P
+dBSbVdM6W5FHsF/x9gIP26rXlUCstBvMmLB2v2Wno9XKP2D7pvGNBR9Asj1YGPzT
+YZrFnEdp6QYUMTOJ6YlDWjgzcCJ32hqkx3vgYEZmnBF6fkg4NbiROz6xi08bTYsA
+xYXP3X03a968i4csSzj9yZe3KOQ55IQO4lnXVs1V399khPFUZtMjlNCJmn/5MpIP
+/ZiLkFsBzyjxqw2QpG0DXaggwY73IS+P8Mjea/Ry7JisIaXD/WWLXF/PqQ6OonOo
+iQyG+IC8iSEPlswyp6TXMEgtANWJhZLgWrx/viMlQ78OZdbdYNi7o7y7PZTZ5eYE
++H3qgvu5kgGuarDS6d4I1h/5WDf4LSQa5S56BiNLQlV7YUx+Ld7jwyASQWsiZuHG
+c/OZlJgjZVIXKw3yRoNh
+=+V6v
 -----END PGP SIGNATURE-----