diff --git a/include/mbedtls/dhm.h b/include/mbedtls/dhm.h
index f3ee14f..c26b5a2 100644
--- a/include/mbedtls/dhm.h
+++ b/include/mbedtls/dhm.h
@@ -47,18 +47,23 @@
 #endif
 
 /**
- * RFC 3526 defines a number of standardized Diffie-Hellman groups
- * for IKE.
- * RFC 5114 defines a number of standardized Diffie-Hellman groups
- * that can be used.
- *
- * Some are included here for convenience.
+ * RFC 3526, RFC 5114 and RFC 7919 standardize a number of
+ * Diffie-Hellman groups, some of which are included here
+ * for use within the SSL/TLS module and the user's convenience
+ * when configuring the Diffie-Hellman parameters by hand
+ * through \c mbedtls_ssl_conf_dh_param.
  *
  * Included are:
+ *  RFC 5114 2.2.  2048-bit MODP Group with 224-bit Prime Order Subgroup
  *  RFC 3526 3.    2048-bit MODP Group
  *  RFC 3526 4.    3072-bit MODP Group
  *  RFC 3526 5.    4096-bit MODP Group
- *  RFC 5114 2.2.  2048-bit MODP Group with 224-bit Prime Order Subgroup
+ *  RFC 7919 A.1   ffdhe2048
+ *  RFC 7919 A.2   ffdhe3072
+ *  RFC 7919 A.3   ffdhe4096
+ *  RFC 7919 A.4   ffdhe6144
+ *  RFC 7919 A.5   ffdhe8192
+ *
  * The constants with suffix "_p" denote the chosen prime moduli, while
  * the constants with suffix "_g" denote the chosen generator
  * of the associated prime field.
@@ -81,6 +86,16 @@
 const char *mbedtls_dhm_rfc3526_modp_4096_p;
 const char *mbedtls_dhm_rfc3526_modp_4096_g;
 
+const char *mbedtls_dhm_rfc7919_ffdhe2048_p;
+const char *mbedtls_dhm_rfc7919_ffdhe2048_g;
+const char *mbedtls_dhm_rfc7919_ffdhe3072_p;
+const char *mbedtls_dhm_rfc7919_ffdhe3072_g;
+const char *mbedtls_dhm_rfc7919_ffdhe4096_p;
+const char *mbedtls_dhm_rfc7919_ffdhe4096_g;
+const char *mbedtls_dhm_rfc7919_ffdhe6144_p;
+const char *mbedtls_dhm_rfc7919_ffdhe6144_g;
+const char *mbedtls_dhm_rfc7919_ffdhe8192_p;
+const char *mbedtls_dhm_rfc7919_ffdhe8192_g;
 
 #if !defined(MBEDTLS_DEPRECATED_REMOVED)
 MBEDTLS_DEPRECATED const char *mbedtls_dhm_rfc5114_modp_2048_p;
diff --git a/library/dhm.c b/library/dhm.c
index 9da33c9..e98148d 100644
--- a/library/dhm.c
+++ b/library/dhm.c
@@ -154,6 +154,152 @@
     "93B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934063199"
     "FFFFFFFFFFFFFFFF";
 const char * mbedtls_dhm_rfc3526_modp_4096_g = "02";
+
+/*
+ * Diffie-Hellman groups from RFC 7919
+ */
+
+const char * mbedtls_dhm_rfc7919_ffdhe2048_p =
+    "FFFFFFFFFFFFFFFFADF85458A2BB4A9AAFDC5620273D3CF1"
+    "D8B9C583CE2D3695A9E13641146433FBCC939DCE249B3EF9"
+    "7D2FE363630C75D8F681B202AEC4617AD3DF1ED5D5FD6561"
+    "2433F51F5F066ED0856365553DED1AF3B557135E7F57C935"
+    "984F0C70E0E68B77E2A689DAF3EFE8721DF158A136ADE735"
+    "30ACCA4F483A797ABC0AB182B324FB61D108A94BB2C8E3FB"
+    "B96ADAB760D7F4681D4F42A3DE394DF4AE56EDE76372BB19"
+    "0B07A7C8EE0A6D709E02FCE1CDF7E2ECC03404CD28342F61"
+    "9172FE9CE98583FF8E4F1232EEF28183C3FE3B1B4C6FAD73"
+    "3BB5FCBC2EC22005C58EF1837D1683B2C6F34A26C1B2EFFA"
+    "886B423861285C97FFFFFFFFFFFFFFFF";
+const char * mbedtls_dhm_rfc7919_ffdhe2048_g = "02";
+
+const char * mbedtls_dhm_rfc7919_ffdhe3072_p =
+    "FFFFFFFFFFFFFFFFADF85458A2BB4A9AAFDC5620273D3CF1"
+    "D8B9C583CE2D3695A9E13641146433FBCC939DCE249B3EF9"
+    "7D2FE363630C75D8F681B202AEC4617AD3DF1ED5D5FD6561"
+    "2433F51F5F066ED0856365553DED1AF3B557135E7F57C935"
+    "984F0C70E0E68B77E2A689DAF3EFE8721DF158A136ADE735"
+    "30ACCA4F483A797ABC0AB182B324FB61D108A94BB2C8E3FB"
+    "B96ADAB760D7F4681D4F42A3DE394DF4AE56EDE76372BB19"
+    "0B07A7C8EE0A6D709E02FCE1CDF7E2ECC03404CD28342F61"
+    "9172FE9CE98583FF8E4F1232EEF28183C3FE3B1B4C6FAD73"
+    "3BB5FCBC2EC22005C58EF1837D1683B2C6F34A26C1B2EFFA"
+    "886B4238611FCFDCDE355B3B6519035BBC34F4DEF99C0238"
+    "61B46FC9D6E6C9077AD91D2691F7F7EE598CB0FAC186D91C"
+    "AEFE130985139270B4130C93BC437944F4FD4452E2D74DD3"
+    "64F2E21E71F54BFF5CAE82AB9C9DF69EE86D2BC522363A0D"
+    "ABC521979B0DEADA1DBF9A42D5C4484E0ABCD06BFA53DDEF"
+    "3C1B20EE3FD59D7C25E41D2B66C62E37FFFFFFFFFFFFFFFF";
+const char * mbedtls_dhm_rfc7919_ffdhe3072_g = "02";
+
+const char * mbedtls_dhm_rfc7919_ffdhe4096_p =
+    "FFFFFFFFFFFFFFFFADF85458A2BB4A9AAFDC5620273D3CF1"
+    "D8B9C583CE2D3695A9E13641146433FBCC939DCE249B3EF9"
+    "7D2FE363630C75D8F681B202AEC4617AD3DF1ED5D5FD6561"
+    "2433F51F5F066ED0856365553DED1AF3B557135E7F57C935"
+    "984F0C70E0E68B77E2A689DAF3EFE8721DF158A136ADE735"
+    "30ACCA4F483A797ABC0AB182B324FB61D108A94BB2C8E3FB"
+    "B96ADAB760D7F4681D4F42A3DE394DF4AE56EDE76372BB19"
+    "0B07A7C8EE0A6D709E02FCE1CDF7E2ECC03404CD28342F61"
+    "9172FE9CE98583FF8E4F1232EEF28183C3FE3B1B4C6FAD73"
+    "3BB5FCBC2EC22005C58EF1837D1683B2C6F34A26C1B2EFFA"
+    "886B4238611FCFDCDE355B3B6519035BBC34F4DEF99C0238"
+    "61B46FC9D6E6C9077AD91D2691F7F7EE598CB0FAC186D91C"
+    "AEFE130985139270B4130C93BC437944F4FD4452E2D74DD3"
+    "64F2E21E71F54BFF5CAE82AB9C9DF69EE86D2BC522363A0D"
+    "ABC521979B0DEADA1DBF9A42D5C4484E0ABCD06BFA53DDEF"
+    "3C1B20EE3FD59D7C25E41D2B669E1EF16E6F52C3164DF4FB"
+    "7930E9E4E58857B6AC7D5F42D69F6D187763CF1D55034004"
+    "87F55BA57E31CC7A7135C886EFB4318AED6A1E012D9E6832"
+    "A907600A918130C46DC778F971AD0038092999A333CB8B7A"
+    "1A1DB93D7140003C2A4ECEA9F98D0ACC0A8291CDCEC97DCF"
+    "8EC9B55A7F88A46B4DB5A851F44182E1C68A007E5E655F6A"
+    "FFFFFFFFFFFFFFFF";
+const char * mbedtls_dhm_rfc7919_ffdhe4096_g = "02";
+
+const char * mbedtls_dhm_rfc7919_ffdhe6144_p =
+    "FFFFFFFFFFFFFFFFADF85458A2BB4A9AAFDC5620273D3CF1"
+    "D8B9C583CE2D3695A9E13641146433FBCC939DCE249B3EF9"
+    "7D2FE363630C75D8F681B202AEC4617AD3DF1ED5D5FD6561"
+    "2433F51F5F066ED0856365553DED1AF3B557135E7F57C935"
+    "984F0C70E0E68B77E2A689DAF3EFE8721DF158A136ADE735"
+    "30ACCA4F483A797ABC0AB182B324FB61D108A94BB2C8E3FB"
+    "B96ADAB760D7F4681D4F42A3DE394DF4AE56EDE76372BB19"
+    "0B07A7C8EE0A6D709E02FCE1CDF7E2ECC03404CD28342F61"
+    "9172FE9CE98583FF8E4F1232EEF28183C3FE3B1B4C6FAD73"
+    "3BB5FCBC2EC22005C58EF1837D1683B2C6F34A26C1B2EFFA"
+    "886B4238611FCFDCDE355B3B6519035BBC34F4DEF99C0238"
+    "61B46FC9D6E6C9077AD91D2691F7F7EE598CB0FAC186D91C"
+    "AEFE130985139270B4130C93BC437944F4FD4452E2D74DD3"
+    "64F2E21E71F54BFF5CAE82AB9C9DF69EE86D2BC522363A0D"
+    "ABC521979B0DEADA1DBF9A42D5C4484E0ABCD06BFA53DDEF"
+    "3C1B20EE3FD59D7C25E41D2B669E1EF16E6F52C3164DF4FB"
+    "7930E9E4E58857B6AC7D5F42D69F6D187763CF1D55034004"
+    "87F55BA57E31CC7A7135C886EFB4318AED6A1E012D9E6832"
+    "A907600A918130C46DC778F971AD0038092999A333CB8B7A"
+    "1A1DB93D7140003C2A4ECEA9F98D0ACC0A8291CDCEC97DCF"
+    "8EC9B55A7F88A46B4DB5A851F44182E1C68A007E5E0DD902"
+    "0BFD64B645036C7A4E677D2C38532A3A23BA4442CAF53EA6"
+    "3BB454329B7624C8917BDD64B1C0FD4CB38E8C334C701C3A"
+    "CDAD0657FCCFEC719B1F5C3E4E46041F388147FB4CFDB477"
+    "A52471F7A9A96910B855322EDB6340D8A00EF092350511E3"
+    "0ABEC1FFF9E3A26E7FB29F8C183023C3587E38DA0077D9B4"
+    "763E4E4B94B2BBC194C6651E77CAF992EEAAC0232A281BF6"
+    "B3A739C1226116820AE8DB5847A67CBEF9C9091B462D538C"
+    "D72B03746AE77F5E62292C311562A846505DC82DB854338A"
+    "E49F5235C95B91178CCF2DD5CACEF403EC9D1810C6272B04"
+    "5B3B71F9DC6B80D63FDD4A8E9ADB1E6962A69526D43161C1"
+    "A41D570D7938DAD4A40E329CD0E40E65FFFFFFFFFFFFFFFF";
+const char * mbedtls_dhm_rfc7919_ffdhe6144_g = "02";
+
+const char * mbedtls_dhm_rfc7919_ffdhe8192_p =
+    "FFFFFFFFFFFFFFFFADF85458A2BB4A9AAFDC5620273D3CF1"
+    "D8B9C583CE2D3695A9E13641146433FBCC939DCE249B3EF9"
+    "7D2FE363630C75D8F681B202AEC4617AD3DF1ED5D5FD6561"
+    "2433F51F5F066ED0856365553DED1AF3B557135E7F57C935"
+    "984F0C70E0E68B77E2A689DAF3EFE8721DF158A136ADE735"
+    "30ACCA4F483A797ABC0AB182B324FB61D108A94BB2C8E3FB"
+    "B96ADAB760D7F4681D4F42A3DE394DF4AE56EDE76372BB19"
+    "0B07A7C8EE0A6D709E02FCE1CDF7E2ECC03404CD28342F61"
+    "9172FE9CE98583FF8E4F1232EEF28183C3FE3B1B4C6FAD73"
+    "3BB5FCBC2EC22005C58EF1837D1683B2C6F34A26C1B2EFFA"
+    "886B4238611FCFDCDE355B3B6519035BBC34F4DEF99C0238"
+    "61B46FC9D6E6C9077AD91D2691F7F7EE598CB0FAC186D91C"
+    "AEFE130985139270B4130C93BC437944F4FD4452E2D74DD3"
+    "64F2E21E71F54BFF5CAE82AB9C9DF69EE86D2BC522363A0D"
+    "ABC521979B0DEADA1DBF9A42D5C4484E0ABCD06BFA53DDEF"
+    "3C1B20EE3FD59D7C25E41D2B669E1EF16E6F52C3164DF4FB"
+    "7930E9E4E58857B6AC7D5F42D69F6D187763CF1D55034004"
+    "87F55BA57E31CC7A7135C886EFB4318AED6A1E012D9E6832"
+    "A907600A918130C46DC778F971AD0038092999A333CB8B7A"
+    "1A1DB93D7140003C2A4ECEA9F98D0ACC0A8291CDCEC97DCF"
+    "8EC9B55A7F88A46B4DB5A851F44182E1C68A007E5E0DD902"
+    "0BFD64B645036C7A4E677D2C38532A3A23BA4442CAF53EA6"
+    "3BB454329B7624C8917BDD64B1C0FD4CB38E8C334C701C3A"
+    "CDAD0657FCCFEC719B1F5C3E4E46041F388147FB4CFDB477"
+    "A52471F7A9A96910B855322EDB6340D8A00EF092350511E3"
+    "0ABEC1FFF9E3A26E7FB29F8C183023C3587E38DA0077D9B4"
+    "763E4E4B94B2BBC194C6651E77CAF992EEAAC0232A281BF6"
+    "B3A739C1226116820AE8DB5847A67CBEF9C9091B462D538C"
+    "D72B03746AE77F5E62292C311562A846505DC82DB854338A"
+    "E49F5235C95B91178CCF2DD5CACEF403EC9D1810C6272B04"
+    "5B3B71F9DC6B80D63FDD4A8E9ADB1E6962A69526D43161C1"
+    "A41D570D7938DAD4A40E329CCFF46AAA36AD004CF600C838"
+    "1E425A31D951AE64FDB23FCEC9509D43687FEB69EDD1CC5E"
+    "0B8CC3BDF64B10EF86B63142A3AB8829555B2F747C932665"
+    "CB2C0F1CC01BD70229388839D2AF05E454504AC78B758282"
+    "2846C0BA35C35F5C59160CC046FD8251541FC68C9C86B022"
+    "BB7099876A460E7451A8A93109703FEE1C217E6C3826E52C"
+    "51AA691E0E423CFC99E9E31650C1217B624816CDAD9A95F9"
+    "D5B8019488D9C0A0A1FE3075A577E23183F81D4A3F2FA457"
+    "1EFC8CE0BA8A4FE8B6855DFE72B0A66EDED2FBABFBE58A30"
+    "FAFABE1C5D71A87E2F741EF8C1FE86FEA6BBFDE530677F0D"
+    "97D11D49F7A8443D0822E506A9F4614E011E2A94838FF88C"
+    "D68C8BB7C5C6424CFFFFFFFF"
+    "FFFFFFFF";
+const char * mbedtls_dhm_rfc7919_ffdhe8192_g = "02";
+
+
 /* Implementation that should never be optimized out by the compiler */
 static void mbedtls_zeroize( void *v, size_t n ) {
     volatile unsigned char *p = v; while( n-- ) *p++ = 0;