diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index 99e2d35ed35c0c5e511bbb97450b44e92d3ff25b..67510b53275a9c03b4ce2efefed4005cd5ab936f 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -1895,6 +1895,8 @@ const drive_settings builtin_knowndrives[] = {
    "-v 245,raw48,DriveLife_Used% "
  },
   { "SiliconMotion based SSDs", // SM2246EN (Transcend TS6500)
+    "ADATA (SP550|SU[89]00)|" // tested with ADATA SP550/O0803B5a, ADATA SU800/Q0913A, ADATA SU800/R0427A,
+      // ADATA SU800/R0918B, ADATA SU900/Q0125A, ADATA SU900/Q0710B
     "R3SL(120|240|480|960)G|" // AMD Radeon Solid State Drives,
     "CT(120|250|500|1000)BX100SSD1|" // Crucial BX100, tested with CT250BX100SSD1/MU02,
       // CT500BX100SSD1/MU02, CT1000BX100SSD1/MU02
@@ -1907,7 +1909,7 @@ const drive_settings builtin_knowndrives[] = {
       // tested with TS32GMSA370/20140402, TS16GMSA370/20140516, TS64GSSD370/20140516,
       // TS256GSSD370/N0815B, TS256GSSD370S/N1114H, TS512GSSD370S/N1114H, TS32GSSD420I/N1114H,
       // TS32GSSD420K/P1225CE
-    "TS(16|32|64|128|512|256)GMTS400S?|" // TS256GMTS400
+    "TS(16|32|64|128|512|256)GMTS4[03]0S?|" // TS256GMTS400, TS256GMTS430S/S0423A
     "TS(120|240)GMTS420|" // Transcend MTS420
     "TS(128G|256G|512G|1T)SSD230S|" // TS128GSSD230S/P1025F8
     "TS(120|240|480|960)GSSD220S|" // TS480GSSD220S/P0520AA
@@ -1919,8 +1921,7 @@ const drive_settings builtin_knowndrives[] = {
       // TS256GESD400K/R0605AS (0x2174:0x2000)
     "MKNSSDRE(1TB|2TB|512GB|500GB|256GB|250GB)|" // MKNSSDRE256GB/N1007C
     "MKNSSDTR(240|500|250|120|480|240)GB(-LT)?|" // MKNSSDTR500GB/O1126A
-    "LITEON LMH-(128|256|512)V2M-.*|" // LITEON LMH-256V2M-11 MSATA 256GB/FM8110C
-    "ADATA SP550", // ADATA SP550/O0803B5a
+    "LITEON LMH-(128|256|512)V2M-.*", // LITEON LMH-256V2M-11 MSATA 256GB/FM8110C
     "", "",
   //"-v 1,raw48,Raw_Read_Error_Rate "
   //"-v 2,raw48,Throughput_Performance "
@@ -1930,6 +1931,7 @@ const drive_settings builtin_knowndrives[] = {
     "-v 149,raw48,Max_SLC_Erase_Ct "
     "-v 150,raw48,Min_SLC_Erase_Ct "
     "-v 151,raw48,Average_SLC_Erase_Ct "
+    "-v 159,raw48,Unkn_SiliconMotion_Attr " // SU800/R0427A, SU900/Q0710B, TS256GMTS430S/S0423A
     "-v 160,raw48,Uncorrectable_Error_Cnt "
     "-v 161,raw48,Valid_Spare_Block_Cnt "
     "-v 163,raw48,Initial_Bad_Block_Count "
@@ -1959,7 +1961,10 @@ const drive_settings builtin_knowndrives[] = {
     "-v 242,raw48,Host_Reads_32MiB "
     "-v 245,raw48,TLC_Writes_32MiB " // FW N0815B, N1114H
     "-v 246,raw48,SLC_Writes_32MiB "
-    "-v 247,raw48,Raid_Recoverty_Ct"
+    "-v 247,raw48,Raid_Recoverty_Ct "
+    "-v 248,raw48,Unkn_SiliconMotion_Attr " // ADATA SU900/Q0125A
+  //"-v 250,raw48,Read_Error_Retry_Rate " // ADATA SU800/Q0913A
+    "-v 251,raw48,Unkn_SiliconMotion_Attr" // ADATA SU800/Q0913A
   },
   { "SMART Modular Technologies mSATA XL+ SLC SSDs", // tested with SH9MST6D16GJSI01
     "SH9MST6D[0-9]*GJSI?[0-9]*", // based on http://www.smartm.com/salesLiterature/embedded/mSATA_overview.pdf
@@ -5302,6 +5307,12 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+  { "USB: ; JMicron JMS576", // USB3.1->SATA
+    "0x152d:0x1576",
+    "", // 0x0204, ICY BOX IB-223U3a-B
+    "",
+    "-d sat"
+  },
   { "USB: ; JMicron JM20329", // USB->SATA
     "0x152d:0x2329",
     "", // 0x0100
@@ -5392,6 +5403,13 @@ const drive_settings builtin_knowndrives[] = {
     "",
     "-d sat"
   },
+  // PNY
+  { "USB: ; PNY",
+    "0x154b:0x5678",
+    "", // 0x5408
+    "",
+    "-d sat"
+  },
   // ASMedia
   { "USB: ; ASMedia",
     "0x174c:0x....",
diff --git a/smartmontools/drivedb.h.raw.asc b/smartmontools/drivedb.h.raw.asc
index cbab2cd9d7288023cf68c9bd9c3de4e8c5fa9a89..bf97756ecb0bea14ec5c6112416ee6c423f99c5f 100644
--- a/smartmontools/drivedb.h.raw.asc
+++ b/smartmontools/drivedb.h.raw.asc
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAABAgAGBQJdUyBOAAoJEOp0qyVyEELFO2AP/2GpYE4sDslbYtksrZ4y32Z3
-ISx8KqNG+z6hfbWpFlb+jFa7DTzb1SUb1rZ5P8xUCLQuJGj5TM5WwBzMrN05wr+x
-/i03a20WZi3cmr4NI+W55RXMIMy99H+Djf+jlYO030HxILzopaa6kv03HEkOl5bX
-i7TDu/vOMCkqO4EZyQSAn/8tanJisHyK1ElezRnKGsJZyLjigu0QGDUMHR9cF1kp
-a8wDmlAD0adCnosmqSps79GaOiHurBgT989ObADWIYWb/yBAihTkPENv3fDHoPWS
-v720C2PWRiCxJIAgwgzL4tmSm4R5H068/x4OvDWdddyq02Ngpg6CUnFzA7vsJM6a
-IfLOGIPx466qTeTeEWOIbqLfzJuJniZxAJwhVI/7+0HTyUclwNhwPtMTkrrnzh25
-ve1Mqa0mKAA8RSQHG9MGqvaq9P6VvEw6B5xYeJ0V1OpmN1nZ2fkC3SccdtyCWHWT
-hPNlqjhwV3bAOuTTcVgDZyELRklbGbRqxTQ5sk2mmiStRNTGSRNc+OknpwQS2Uhu
-RFO58GUYVVL5WPttZswxxRIt6M1eH5vT+vfDKD2cfO325Mnyd335h0f5Hs9lecHx
-y4kZb7q0bFzqs4NYiG4OdpVTLUwq2btRKMTS2/2edEVfZzSbRtM/II5toU4FBQSs
-jG11Fo5X6s/iO4//0z72
-=IPje
+iQIcBAABAgAGBQJdXFF2AAoJEOp0qyVyEELFuecQAKX7IEHl3l9vqcSVdhfl91n8
+O0X51YiAJA7PeLBV2DzxAc5MdJIB0dGK+8enqxmE//+lYNFM/sZu46wbYWjbDqtX
+gylkQ9B8ucJvlv9GWBwsSd23qWd1VAzKcwN7c6gh6awU3ShEbMb2OHXxr+T/g0SW
+B+CoZlDEi9iZ6IR4bjTshlxKvmfUABYjX0aJLjaRbXIN0ozMJ4oXFtLxsau3JQVj
+/nIMQ4ND/COBilDh8RRpqrbt3lrk9J0GSdbcVOGj5WcDxs1FgxUuz1P4Mn/8LmO+
+Q98uJyFZO9igrbwJrorMmJgf0whNfBIy2wgWQ+k2ZTF6WYuHr+JLQ/lnyvtiLlOl
+aByljkfTwM6i2WfNg/8/yTr50I38Rv0XU+QRqCHO8i825HQHaR0AvjIQiOaXq4hn
+LQFHtpbAnjei16YIoIX0/0TDBD2O8X75GtTIGq9T7NkFoIl4xWpxP299NOGLm25+
+34onmbrBcnXrk+sH8ILSQIKp175HGQa+QzQBrmVfm3ld3Mi4h+/E37xY1E6J0yQe
+31wevPG+Twh/7ISquTx6xlZl1+u4xySUbWZ3AMZTqcxjq+fD42oLppEaB0smLHEI
+w7ghrayfUZL/c5wCnrevcAKbZa0nMnDhHdUXWHLPEGhaa/KFxuwmkArfhaas32b/
+kvc70uofCgyeaEBlHDDY
+=O+hr
 -----END PGP SIGNATURE-----