diff --git a/smartmontools/ChangeLog b/smartmontools/ChangeLog
index 0d64d09098931fb224f53907c61b7b892b5a6e23..213d8ef4f1b95d052783ab8169a488cb565287fa 100644
--- a/smartmontools/ChangeLog
+++ b/smartmontools/ChangeLog
@@ -1,5 +1,13 @@
 $Id$
 
+2022-05-08  Gabriele Pohl  <contact@dipohl.de>
+
+	drivedb.h:
+	- Crucial/Micron Client SSDs: CT4000MX500SSD1 (#1610)
+	- Western Digital Gold: WDC WD161KRYZ-01AGBB0 (#1608) New family
+	variant 'CMR' dropped, entry moved to 'Western Digital Gold' and
+	patterns from file product-brief-wd-gold-hdd.pdf also added there.
+
 2022-05-02  Gabriele Pohl  <contact@dipohl.de>
 
 	drivedb.h:
diff --git a/smartmontools/drivedb.h b/smartmontools/drivedb.h
index 48e21901f78dd77c96071fa6561c79365fdbe15c..45ce93989bd73922287b75f1235bf3a061436550 100644
--- a/smartmontools/drivedb.h
+++ b/smartmontools/drivedb.h
@@ -425,10 +425,10 @@ const drive_settings builtin_knowndrives[] = {
       // tested with CT240BX300SSD1/M2CR010
     "CT(120|240|480|960|[12]000)BX500SSD1|" // Silicon Motion SM2258XT, tested with CT120BX500SSD1/M6CR013,
       // CT1000BX500SSD1/M6CR030, CT2000BX500SSD1/M6CR030
-    "CT(250|500|1000|2000)MX500SSD[14]|" // Silicon Motion SM2258, tested with CT250MX500SSD1/M3CR010
+    "CT(250|500|[124]000)MX500SSD[14]|" // Silicon Motion SM2258, tested with CT250MX500SSD1/M3CR010
       // CT500MX500SSD1/M3CR010, CT1000MX500SSD1/M3CR010, CT2000MX500SSD1/M3CR010,
       // CT500MX500SSD1/M3CR020, CT250MX500SSD4/M3CR022, CT500MX500SSD1/M3CR022,
-      // CT500MX500SSD1/M3CR023, CT1000MX500SSD1/M3CR032
+      // CT500MX500SSD1/M3CR023, CT1000MX500SSD1/M3CR032, CT4000MX500SSD1/M3CR044
     "Micron_M500_MTFDDA[KTV](120|240|480|960)MAV|"// tested with Micron_M500_MTFDDAK960MAV/MU05
     "Micron_M500DC_(EE|MT)FDDA[AK](120|240|480|800)MBB|" // tested with Micron_M500DC_EEFDDAA120MBB/129,
       // Micron_M500DC_MTFDDAK800MBB/0129
@@ -4942,16 +4942,11 @@ const drive_settings builtin_knowndrives[] = {
       // WDC WD4003FRYZ-01F0DB0/01.01H01, WDC WD6003FRYZ-01F0DB0/01.01H01,
       // WDC WD8003FRYZ-01JPDB1/01.01H02, WDC WD8004FRYZ-01VAEB0/01.01H01,
       // WDC WD102KRYZ-01A5AB0/01.01H01, WDC WD121KRYZ-01W0RB0/01.01H01,
-      // WDC WD141KRYZ-01C66B0/01.01H01
-    "WDC WD([12]005[FV]B|4002FY|4003FR|600[23]FR|800[234]FR|(1[024]1|102)KR)YZ-.*",
+      // WDC WD141KRYZ-01C66B0/01.01H01, WDC WD161KRYZ-01AGBB0/01.01H01
+    "WDC WD([12]005[FV]B|4002FY|4003FR|600[23]FR|800[234]FR|([12][02468]1|102)KR)YZ-.*",
     "", "",
     "-v 22,raw48,Helium_Level" // WD121KRYZ, WD141KRYZ
   },
-  { "Western Digital Gold (CMR)", // tested with WDC WD161KRYZ-01AGBB0/01.01H01
-    "WDC WD161KRYZ-.*",
-    "", "",
-    "-v 22,raw48,Helium_Level"
-  },
   { "Western Digital Blue Mobile", // tested with WDC WD5000LPVX-08V0TT2/03.01A03,
       // WDC WD10JPVX-75JC3T0/0301A03,  WDC WD10JPVX-22JC3T0/01.01A01,
       // WDC WD20NPVZ-00WFZT0/01.01A01