diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index bf0446f996cc641f848fbb8da3ccdc8c4f601a85..683801ccbbdfef261043c32ced15b183bb06564e 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -1215,11 +1215,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 "
@@ -1362,6 +1363,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.?",
     "", "",
@@ -4283,15 +4313,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 e786380dbeea2843d4e6abbb6c56c4f8904dcf6d..b3798408b6bb1ad8131848cec72c3ec8b3a90f1f 100644
--- a/smartmontools/drivedb.h.raw.asc
+++ b/smartmontools/drivedb.h.raw.asc
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAABAgAGBQJcvdyYAAoJEOp0qyVyEELFUhAQAL9ds4I9VtSAO9wP80B5o6VQ
-brbkn6C7jWjXlR5ziyrezfLYJTeZouBXOphR8cyKIDLHUKPJi/X6JX9r3qiE7PWD
-twuxgLIbl0BodV1BERXqOiqBC3HJWv4R7iooEwyRydZd6kEhhPFQMcpgcpQPSt6s
-GXMwJTocAFz2TGlb/gwxtMZzo8gfC36m5N9qA1ESB5OfzNx+UL6YHJ86ZJVIj56q
-eXF3lrlBVfs7ySrrPM8U4moCdtcLHQmmVvqzJIRHISCrFfZLlNPypcFE1tmJYtca
-wL1pwNSt/k3NRSl4G2V9yKDKY35wqDCFHXXQ0YrSQA48Ug+NASMPcbI4MxIo3DlD
-F73SrVNnaloxl2EnwqB884j2bDzkwmfznxA0StJ8obRjKq+2RSP3ZzKU2GbaHesM
-ia73NAjt1BpeRTckZ8Gi5CYajNHOkvL+nizJ0S9uHWupiQHeRghD+rwoeYHpJaTI
-bE7OkK0g3MdhhJUiCE6GvXcPf6QNluDCYrypYV1kQbZJOOgiNO+yHRyO8DNkJ6w4
-hyNCWUmJN/VsZrdhy9oxp1ZZMKgcmEmJQelYFcTD79osu+3x8ZeeWsFugf+IN5Xf
-4aMXlzzsgYXhDyyyjaaoWLM3VgQmUGSKK6Jey6cfpOSe310AajMRr3odgSJj8KxI
-bxyadcfKhEf4rXgzgibs
-=Jkzx
+iQIcBAABAgAGBQJc5Fu7AAoJEOp0qyVyEELFEuMP/jSQtEP35fux2Zwy/hhmcSjg
+nniOxLBOcroR0KMSOg68iikYQZAZ2HmZ3dsrOCXH5ezhdAq5bYIxxMV00ammV1S2
+KJu4oCTyxR7P9PyMEhXjkYsa8zXLWi1gaEvEoHD6cDYiosMd8rr5JEHjrpcakmFx
+u2bMQL8F0xFS1uWfN0gnz4GptYCKOg3RX6TjW/cqIlkYsJdsCvxdHQizPbwyRwpi
+GpJS6VENlISJztlJecv1AEtd2Xez0Jh3C3SIit9fRclI/G/lDrZUB/JgVfGMdwyK
+pEf27XJkaiyA6AK0YHaKOMIC6wvD07VGZHqnkAh8YwROTCjtligJOghx2bzH/f7Z
+iULNdbWDrhFD7pPLAy4tV5H4bxvVWTel4iLVpolThLC/VG9Zxj374G4SyaPB/aca
+txCUq1Me77vVDUnTNnxdHvMus6wEcXWl7QL8sCKtv2nCutxDC5rsVsV6zW4ekJ4u
+GPjjUGSjfh1EWsYW8bZwUw2pFHYXMWEfzvcs9PXN96yahzrvK2ZB5Z2NY7uKWSSg
+Ny+hm4ZGSCuLfZxEMVP1STVUNmTi5QVpJD052DVAiSAFElzGa/0rIseUwQykUlBp
+NVqCFFH04D07Sr15qsJnSMNBJ+INuAAfTowka58YO5R5DykJaPq0HS22m7t98RZD
+WrjgX2Do3Al3NMnDfiNl
+=5vde
 -----END PGP SIGNATURE-----