diff --git a/include/mbedtls/dhm.h b/include/mbedtls/dhm.h
index 10fda5beb..2de728b4f 100644
--- a/include/mbedtls/dhm.h
+++ b/include/mbedtls/dhm.h
@@ -40,8 +40,6 @@
 #define MBEDTLS_ERR_DHM_FILE_IO_ERROR                     -0x3480  /**< Read/write of file failed. */
 
 /**
- * RFC 2409 defines a number of standardized Diffie-Hellman groups
- * that can be used.
  * RFC 3526 defines a number of standardized Diffie-Hellman groups
  * for IKE.
  * RFC 5114 defines a number of standardized Diffie-Hellman groups
@@ -50,22 +48,11 @@
  * Some are included here for convenience.
  *
  * Included are:
- *  RFC 2409 6.2.  1024-bit MODP Group (Second Oakley Group)
  *  RFC 3526 3.    2048-bit MODP Group
  *  RFC 3526 4.    3072-bit MODP Group
- *  RFC 5114 2.1.  1024-bit MODP Group with 160-bit Prime Order Subgroup
+ *  RFC 3526 5.    4096-bit MODP Group
  *  RFC 5114 2.2.  2048-bit MODP Group with 224-bit Prime Order Subgroup
  */
-#define MBEDTLS_DHM_RFC2409_MODP_1024_P               \
-    "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" \
-    "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" \
-    "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245" \
-    "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED" \
-    "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381" \
-    "FFFFFFFFFFFFFFFF"
-
-#define MBEDTLS_DHM_RFC2409_MODP_1024_G          "02"
-
 #define MBEDTLS_DHM_RFC3526_MODP_2048_P               \
     "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" \
     "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" \
@@ -101,21 +88,31 @@
 
 #define MBEDTLS_DHM_RFC3526_MODP_3072_G          "02"
 
-#define MBEDTLS_DHM_RFC5114_MODP_1024_P               \
-    "B10B8F96A080E01DDE92DE5EAE5D54EC52C99FBCFB06A3C6" \
-    "9A6A9DCA52D23B616073E28675A23D189838EF1E2EE652C0" \
-    "13ECB4AEA906112324975C3CD49B83BFACCBDD7D90C4BD70" \
-    "98488E9C219A73724EFFD6FAE5644738FAA31A4FF55BCCC0" \
-    "A151AF5F0DC8B4BD45BF37DF365C1A65E68CFDA76D4DA708" \
-    "DF1FB2BC2E4A4371"
+#define MBEDTLS_DHM_RFC3526_MODP_4096_P                \
+    "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" \
+    "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" \
+    "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245" \
+    "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED" \
+    "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D" \
+    "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F" \
+    "83655D23DCA3AD961C62F356208552BB9ED529077096966D" \
+    "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B" \
+    "E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9" \
+    "DE2BCBF6955817183995497CEA956AE515D2261898FA0510" \
+    "15728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64" \
+    "ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7" \
+    "ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6B" \
+    "F12FFA06D98A0864D87602733EC86A64521F2B18177B200C" \
+    "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB31" \
+    "43DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D7" \
+    "88719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA" \
+    "2583E9CA2AD44CE8DBBBC2DB04DE8EF92E8EFC141FBECAA6" \
+    "287C59474E6BC05D99B2964FA090C3A2233BA186515BE7ED" \
+    "1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA9" \
+    "93B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934063199" \
+    "FFFFFFFFFFFFFFFF"
 
-#define MBEDTLS_DHM_RFC5114_MODP_1024_G               \
-    "A4D1CBD5C3FD34126765A442EFB99905F8104DD258AC507F" \
-    "D6406CFF14266D31266FEA1E5C41564B777E690F5504F213" \
-    "160217B4B01B886A5E91547F9E2749F4D7FBD7D3B9A92EE1" \
-    "909D0D2263F80A76A6A24C087A091F531DBF0A0169B6A28A" \
-    "D662A4D18E73AFA32D779D5918D08BC8858F4DCEF97C2A24" \
-    "855E6EEB22B3B2E5"
+#define MBEDTLS_DHM_RFC3526_MODP_4096_G          "02"
 
 #define MBEDTLS_DHM_RFC5114_MODP_2048_P               \
     "AD107E1E9123A9D0D660FAA79559C51FA20D64E5683B9FD1" \