diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index 1f352563b0702d4d407749f7e956e388ff3f652a..c873f47fcd538cbcae56e9c2341e0f10977b8b5f 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -68,7 +68,7 @@
 /*
 const drive_settings builtin_knowndrives[] = {
  */
-  { "VERSION: 6.0/5170 2021-01-17 16:11:20 $Id$",
+  { "VERSION: 6.0/5211 2021-03-08 18:07:28 $Id$",
     "-", "-",
     "Version information",
     ""
@@ -3673,12 +3673,13 @@ const drive_settings builtin_knowndrives[] = {
     "TOSHIBA MG03ACA[1234]00Y?",
     "", "", ""
   },
-  { "Toshiba 3.5\" MD04ACA... Enterprise HDD", // tested with TOSHIBA MD04ACA500/FP1A
-    "TOSHIBA MD04ACA[2345]00",
+  { "Toshiba MG04ACA... Enterprise HDD", // tested with TOSHIBA MD04ACA500/FP1A,
+      // TOSHIBA MG04ACA600A/FS2B, TOSHIBA MG04ACA400NY/FK5D (Dell)
+    "TOSHIBA MG04ACA[23456]00([AEN].?)?",
     "", "", ""
   },
-  { "Toshiba 3.5\" MG04ACA... Enterprise HDD", // tested with TOSHIBA MG04ACA600A/FS2B
-    "TOSHIBA MG04ACA[23456]00[AE].?",
+  { "Toshiba MG05ACA... Enterprise Capacity HDD", // tested with TOSHIBA MG05ACA800E/GX2A
+    "TOSHIBA MG05ACA800[AE]",
     "", "", ""
   },
   { "Toshiba MG06ACA... Enterprise Capacity HDD", // tested with TOSHIBA MG06ACA800E/4303,
@@ -3692,6 +3693,12 @@ const drive_settings builtin_knowndrives[] = {
     "-v 23,raw48,Helium_Condition_Lower "
     "-v 24,raw48,Helium_Condition_Upper"
   },
+  { "Toshiba MG08ACA... Enterprise Capacity HDD", // tested with TOSHIBA MG08ACA16TE/0102
+    "TOSHIBA MG08ACA16T[AE]Y?",
+    "", "",
+    "-v 23,raw48,Helium_Condition_Lower "
+    "-v 24,raw48,Helium_Condition_Upper"
+  },
   { "Toshiba 3.5\" DT01ABA... Desktop HDD", // tested with TOSHIBA DT01ABA300/MZ6OABB0
     "TOSHIBA DT01ABA(100|150|200|300)",
     "", "", ""
@@ -3701,14 +3708,27 @@ const drive_settings builtin_knowndrives[] = {
     "TOSHIBA DT01ACA(025|032|050|075|100|150|200|300)",
     "", "", ""
   },
-  { "Toshiba X300", // tested with TOSHIBA HDWE160/FS2A
-    "TOSHIBA HDWE1[456]0",
+  { "Toshiba N300 NAS HDD", // tested with TOSHIBA HDWQ140/FJ1M, TOSHIBA HDWN180/GX2M,
+      // TOSHIBA HDWN160/FS1M, TOSHIBA HDWG11A/0603, TOSHIBA HDWG21C/0601, TOSHIBA HDWG21E/0601
+    "TOSHIBA HDW([GNQ]1[468]0|G(11A|21[CE]|31G))",  // 11A:10TB, 21C:12TB, 21E:14TB, 31G: 16TB
+    "", "",
+    "-v 23,raw48,Helium_Condition_Lower " // ] >= 12TB
+    "-v 24,raw48,Helium_Condition_Upper"  // ]
+  },
+  { "Toshiba P300 (CMR)", // tested with TOSHIBA HDWD120/MX4OACF0
+    "TOSHIBA HDWD1(05|10|20|30)",
     "", "", ""
   },
-  { "Toshiba P300", // tested with TOSHIBA HDWD120/MX4OACF0
-    "TOSHIBA HDWD1(30|20|10|05)",
+  { "Toshiba P300 (SMR)", // tested with TOSHIBA HDWD240/KQ000A
+    "TOSHIBA HDWD2[246]0",
     "", "", ""
   },
+  { "Toshiba X300", // tested with TOSHIBA HDWE160/FS2A, TOSHIBA HDWF180/GX0B
+    "TOSHIBA HDW(E1[456]0|[FR]180|R(11A|21[CE]|31G))",  // 11A:10TB, 21C:12TB, 21E:14TB, 31G: 16TB
+    "", "",
+    "-v 23,raw48,Helium_Condition_Lower " // ] >= 12TB
+    "-v 24,raw48,Helium_Condition_Upper"  // ]
+  },
   { "Toshiba L200 (CMR)",
     "TOSHIBA HDW[JK]1(05|10)",
     "", "", ""
diff --git a/smartmontools/drivedb.h.raw.asc b/smartmontools/drivedb.h.raw.asc
index c363faad9f6a9afde576a2a0bcfc34a3f128fb2d..3c8658246aadee340d8606a19c0228fc36c1f9d8 100644
--- a/smartmontools/drivedb.h.raw.asc
+++ b/smartmontools/drivedb.h.raw.asc
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQEcBAABAgAGBQJgBHBWAAoJEPOHY87f0iVZteEIAIeKJzwW54rGEMBrMJKndSoZ
-HQGw3VZ8IGGm7Awi3RVap+CHOToOsjdQELP2UOtdM8vgx8qVvKEU+bFKBoG3W+tm
-hbDLTBgPO0XqfOxkG6VRSrjpOyx4qXk5qlhfJd3IEiG/H2hWNKRY9832GImJPRez
-CHb1P3Yl6t9nOfTjorRwyw9LxcF9zd+LdlsxGKSi3GaSr87C2GPJA+/V763+Hk33
-w6BuM202wAmW6iS8dPj+8m6OQTJW/oWMPC5L1X5XHnOxkaawXVM8yWMwCNDqxKqw
-Crb16uTC5FHWLwrD41FAZiRZiIGphYpUv8igg+LawCSYA0GAQrVaZZASbcSXthk=
-=reaL
+iQEcBAABAgAGBQJgRmjNAAoJEPOHY87f0iVZbYoH+wVt4Rmm5KKtcS8Sc3/YEGSp
+xwMddesrxxQVjjvXDdGtOs2gNwjH9CEdNq5eBNasKOayC9NcYBn1rGD/9cBYS28F
+mvjoNa+rrrs1dCtHeFfLHOLLJh4JA3BNaZ8VEKhmOxhRqvGxL3J8Y9XVNp6+glZv
+P/EOnlkB9fM50YKdBMrYRHiaB5iqT9p6IT8QSXlqsVrtkjysbeUd6FOnudO+DJq8
+m+WxEqj/RcypES75E3eSMXazLGv1JiETA/FJfnTAUaL4UybOCzVtLMo3RbJVyduv
+x2Om/tB6jiZhjzhFHq+4VKDS9hw3Ix8G01oUUwLELZEyEJ0UvURKvov5ElYMZ5s=
+=8dTj
 -----END PGP SIGNATURE-----