diff --git a/smartmontools/ChangeLog b/smartmontools/ChangeLog
index 1acd6d677d5f3f03a03c37a1ea9df289ff4b02d0..f2d8f46d60c74a6b5f77621d72655b385ab7af5a 100644
--- a/smartmontools/ChangeLog
+++ b/smartmontools/ChangeLog
@@ -1,5 +1,11 @@
 $Id$
 
+2018-10-09  Anthony D'Atri  <anthony.datri@gmail.com>
+
+	drivedb.h: (#1096)
+	- Samsung based SSDs: Samsung PM863a (#951, #952, #961, #962, #972)
+	- Intel 730 and DC S35x0/3610/3700 Series SSDs: Dell-flavor S3500
+
 2018-10-09  Thomas Niedermeier  <tniedermeier@thomas-krenn.com>
 
 	drivedb.h: Samsung PM883 and SM883 (GH pull/19)
diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index b67e3ea2098409ee7f41d9462f9a4952f6d327fa..b1ee3df5764c5e3adaa30049f12944498d0d3e21 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -1226,8 +1226,9 @@ const drive_settings builtin_knowndrives[] = {
   { "Intel 730 and DC S35x0/3610/3700 Series SSDs", // tested with INTEL SSDSC2BP480G4, SSDSC2BB120G4/D2010355,
       // INTEL SSDSC2BB800G4T, SSDSC2BA200G3/5DV10250, SSDSC2BB080G6/G2010130,  SSDSC2BX200G4/G2010110,
       // INTEL SSDSC2BB016T6/G2010140, SSDSC2BX016T4/G2010140, SSDSC2BB150G7/N2010101
-    "INTEL SSDSC(1N|2B)[ABPX]((080|100|120|150|160|200|240|300|400|480|600|800)G[3467]T?|(012|016)T[46])",
+    "INTEL SSDSC(1N|2B)[ABPX]((080|100|120|150|160|200|240|300|400|480|600|800)G[3467][RT]?|(012|016)T[46])",
       // A = S3700, B*4 = S3500, B*6 = S3510, P = 730, X = S3610
+      // Dell ships drives with model of the form SSDSC2BB120G4R
     "", "",
   //"-v 3,raw16(avg16),Spin_Up_Time "
   //"-v 4,raw48,Start_Stop_Count "
@@ -1510,6 +1511,8 @@ const drive_settings builtin_knowndrives[] = {
       // SAMSUNG MZ7GE240HMGR-00003/EXT0303Q
     "SAMSUNG MZ7LM(120|240|480|960|1T9|3T8)HC(JM|HP|GR|FD)-.*|" // PM863 Series, tested with
       // SAMSUNG MZ7LM960HCHP-0E003/GXT3003Q
+    "SAMSUNG MZ7LM(240|480|960|1T9|3T8)HM(JP|HQ|LP)-.*|" // PM863a Series, tested with
+      // SAMSUNG MZ7LM3T8HMLP-00005/GXT5104Q
     "SAMSUNG MZ7KM(120|240|480|960|1T9)HA(JM|HP|GR|FD|JM)-.*|" // SM863, tested with MZ7KM480HAHP-0E005/GXM1003Q
     "SAMSUNG MZ7LH(240|480|960|1T9|3T8|7T6)H[AM](HQ|JR|LT|LA)-.*|" //PM883, tested with SAMSUNG MZ7LH960HAJR-00005
     "SAMSUNG MZ7KH(240|480|960|1T9|3T8)HA(HQ|JR|LS)-.*|" //SM883