diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index a6abfe3da1ae9db94e997dbe4272449531734489..1f1ba67ba39a226f1897b35666599ca6e0a43fd3 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -301,8 +301,7 @@ const drive_settings builtin_knowndrives[] = {
     "Micron_M600_(EE|MT)FDDA[KTV](128|256|512|1T0)MBF[25Z]?|" // tested with Micron_M600_MTFDDAK1T0MBF/MU01
     "Micron_M500DC_(EE|MT)FDDA[AK](120|240|480|800)MBB|" // tested with Micron_M500DC_EEFDDAA120MBB/129, Micron_M500DC_MTFDDAK800MBB/0129
     "Micron_1100_MTFDDA[KV](256|512|1T0|2T0)TBN|" // Marvell 88SS1074, tested Micron_1100_MTFDDAK256TBN/M0MU020
-    "MICRON_M510DC_(EE|MT)FDDAK(120|240|480|800|960)MBP|" // Micron_M510DC_MTFDDAK240MBP/0005
-    "Micron_5100_(EE|MT)FDDA[KV](240|480|960|1T9|3T8|7T6)T(BY|CB|CC)", // tested with Micron_5100_MTFDDAK1T9TBY
+    "MICRON_M510DC_(EE|MT)FDDAK(120|240|480|800|960)MBP", // Micron_M510DC_MTFDDAK240MBP/0005
     "", "",
   //"-v 1,raw48,Raw_Read_Error_Rate "
     "-v 5,raw48,Reallocate_NAND_Blk_Cnt "
@@ -330,6 +329,39 @@ const drive_settings builtin_knowndrives[] = {
     "-v 247,raw48,Host_Program_Page_Count "
     "-v 248,raw48,Bckgnd_Program_Page_Cnt"
   },
+  // Reference: https://www.micron.com/resource-details/feec878a-265e-49a7-8086-15137c5f9011
+  // TN-FD-34: 5100 SSD SMART Implementation
+  {
+    "Micron 5100 Pro / 5200 SSDs",
+    "(Micron_5100_)?(EE|MT)FDDA[KV](240|480|960|1T9|3T8|7T6)T(BY|CB|CC)|" // Matches both stock and Dell OEM
+    "(Micron_5200_)?MTFDDAK(480|960|1T9|3T8|7T6)TD(C|D|N)",
+    "", "",
+  //"-v 1,raw48,Raw_Read_Error_Rate "
+  //"-v 5,raw48,Reallocated_Block_Count "
+  //"-v 9,raw24(raw8),Power_On_Hours "  // raw24(raw8)??
+  //"-v 12,raw48,Power_Cycle_Count "
+    "-v 170,raw48,Reserved_Block_Pct " // Percentage of remaining reserved blocks available
+    "-v 171,raw48,Program_Fail_Count "
+    "-v 172,raw48,Erase_Fail_Count "
+    "-v 173,raw48,Avg_Block-Erase_Count "
+    "-v 174,raw48,Unexpect_Power_Loss_Ct "
+  //"-v 180,raw48,Reserved_Block_Count " // absolute count of remaining reserved blocks available
+    "-v 183,raw48,SATA_Int_Downshift_Ct " // SATA speed downshift count
+  //"-v 184,raw48,Error_Correction_Count "
+  //"-v 187,raw48,Reported_Uncorrect " // Number of UECC correction failures
+  //"-v 188,raw48,Command_Timeouts "
+  //"-v 194,tempminmax,Temperature_Celsius " // 100 - degrees C, wraps: 101 reported as 255
+  //"-v 195,raw48,Cumulativ_Corrected_ECC "
+  //"-v 196,raw48,Reallocation_Event_Ct "
+  //"-v 197,raw48,Current_Pending_Sector " // Use the raw value
+  //"-v 198,raw48,Offline_Uncorrectable "  // Use the raw value
+  //"-v 199,raw48,UDMA_CRC_Error_Count "   // Use the raw value
+    "-v 202,raw48,Percent_Lifetime_Remain " // Remaining endurance, trips at 10%
+    "-v 206,raw48,Write_Error_Rate "
+    "-v 210,raw48,RAIN_Success_Recovered "  // Total number of NAND pages recovered by RAIN
+    "-v 247,raw48,Host_Program_Page_Count "
+    "-v 248,raw48,Bckgnd_Program_Page_Cnt"
+  },
   { "Micron M500DC/M510DC Enterprise SSDs",
     "Micron_M500DC_(EE|MT)FDDA[AK](120|240|480|800)MBB|" // tested with
       // Micron_M500DC_EEFDDAA120MBB/129, Micron_M500DC_MTFDDAK800MBB/0129
@@ -2865,8 +2897,8 @@ const drive_settings builtin_knowndrives[] = {
   },
   { "HGST Deskstar NAS", // tested with HGST HDN724040ALE640/MJAOA5E0,
        // HGST HDN726050ALE610/APGNT517, HGST HDN726060ALE610/APGNT517
-       // HGST HDN726060ALE614/K1HE594D
-    "HGST HDN72(4030|4040|6050|6060)ALE6(10|14|40|04)",
+       // HGST HDN726040ALE614/APGNW7JH, HGST HDN726060ALE614/K1HE594D
+    "HGST HDN72(4030|4040|6040|6050|6060)ALE6(10|14|40|04)",
     "", "", ""
   },
   { "Hitachi Ultrastar A7K1000", // tested with
@@ -2913,6 +2945,11 @@ const drive_settings builtin_knowndrives[] = {
     "", "",
     "-v 22,raw48,Helium_Level"
   },
+  { "HGST Ultrastar DC HC520 (He12)", // tested with HGST HUH721212ALE600/LEGNT3D0
+    "HGST HUH721212AL[EN]60[014]",
+    "", "",
+    "-v 22,raw48,Helium_Level"
+  },
   { "HGST MegaScale 4000", // tested with HGST HMS5C4040ALE640/MPAOA580
     "HGST HMS5C4040[AB]LE64[01]", // B = DC 4000.B
     "", "", ""
diff --git a/smartmontools/drivedb.h.raw.asc b/smartmontools/drivedb.h.raw.asc
index 5e8657b9acdef2ceddb02fa80a744a2dd3513c11..e2f0e0c3a985824196d46cf83ca7fbe3b3500bd8 100644
--- a/smartmontools/drivedb.h.raw.asc
+++ b/smartmontools/drivedb.h.raw.asc
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQEcBAABAgAGBQJbluCVAAoJEPOHY87f0iVZbrIH/jEnuoJidHGpzAdBZqYqPaNR
-TTbICnIw+3V49ra4PHsqXx7/GOk/uSmz0+I1iiNnbuFNRWXSrB3BE5jlT8UeH505
-AgOrj+hK5b47lHOC2mby0TO/6V4TKUkbeeoqAEw4qb4FgTp1vEhkqE4IBEHp8IH9
-0/SBO2L8fBgW1bWIItOY5qrZRfzUwUpTn8oQgyboOagBbK0DLxBH/cuSJ6yppjps
-JuySKBbGxwoYQphx0ScWQnO4MhHUchSUg5v0LyNyo/aMVkYxwDi78a6gjWc0d9zf
-gR5wDiu9AOg6fRe3M677E6TgDRe+Oca0SUrD+LHCQ97a/xoo45UrE/y0uenbH0s=
-=Ud0k
+iQEcBAABAgAGBQJbmPYyAAoJEPOHY87f0iVZj5kH/0QZW0N0UISVyEgSNYB/IbFZ
+pnz6pasTvi346RP3dGVSksiTWatV/ErxWcevRQ0dnrc+lioMjhARajYQmT0nXOlR
+7dBI2dyWbP1WJ7Nm7/S8wFzxRND9ntuPBvCN32DGmIu6TXnQJ+JROekpMpl6MxIz
+xzV39RLdCtYZ7G3SCSCRAF/tJiNCv+xM6TH2iM1htPIXfw1uMFA8sHDtMHARFKeA
+j2N/Lf+Wt/bPwOuB2wybrmw20/ebF9o38f/g9yKfpYIec7reFZ/fZnb538+MEl34
+iTI+PQb5VGCHPzGByxi8/LVfQhpyUQjBgjogl0icp2VEz3E6o9ElKNtpr7vojIE=
+=MFxM
 -----END PGP SIGNATURE-----