diff --git a/Makefile b/Makefile
index f05be2581..72aea5c58 100644
--- a/Makefile
+++ b/Makefile
@@ -316,6 +316,11 @@ style-fix: want-pear-PHP_CodeSniffer
 license:
 	@${.CURDIR}/Scripts/license > ${.CURDIR}/LICENSE
 
+dhparam:
+.for BITS in 1024 2048 4096
+	openssl dhparam -out ${.CURDIR}/src/etc/dh-parameters.${BITS} ${BITS}
+.endfor
+
 test: want-phpunit6
 	@cd ${.CURDIR}/src/opnsense/mvc/tests && \
 	    phpunit --configuration PHPunit.xml
diff --git a/src/etc/dh-parameters.1024 b/src/etc/dh-parameters.1024
index d3861c584..1f96c4815 100644
--- a/src/etc/dh-parameters.1024
+++ b/src/etc/dh-parameters.1024
@@ -1,5 +1,5 @@
 -----BEGIN DH PARAMETERS-----
-MIGHAoGBAMXD4Gp7MREfpsNzpasVrg5EcRwvZioDO7qp8NSHMwtFb8RgYlqGHt2p
-Y6PJOMsgX1oVC1wLywEYXWTqycqREVdNIE+sAosVLNfK11UuzOYUCQMbPE2Ivv04
-QYuWd5orxQ/y//bIAO4S0O1oQk0M3JcGuW6Qb5zj4GP3ZG7TtXvbAgEC
+MIGHAoGBAIJAIVJVF/+iZWJOgluaFuu49S5lFkIHODioplhoNaTJu51B16egGZcT
+bhrQIsECVBb04HDUPzNay5JjQA71/LtgSmwCmD7UaKkouTjSp8MpwrUCW9Dc/QDT
+DRvOjz+xPY7YSkseuiba64sU9OR5qxSpkwEupxO3WLttHxBf0fAjAgEC
 -----END DH PARAMETERS-----
diff --git a/src/etc/dh-parameters.2048 b/src/etc/dh-parameters.2048
index 6df803aac..fbaaca6e7 100644
--- a/src/etc/dh-parameters.2048
+++ b/src/etc/dh-parameters.2048
@@ -1,8 +1,8 @@
 -----BEGIN DH PARAMETERS-----
-MIIBCAKCAQEAhhSFqN3GzRxwDo3dc4lnfGF88J8zly1HEF5i/rxwEv8IrWPxznbz
-P7PlxVQMCiKGXOjKE4ATT2adpizhKNgAF7m4bfKMKwFcr/M7KJIkZM0poSWY+iUp
-S7smaqn0J+8tyhx5IhdSNBvV/N/be02Z9L3PAPt0O087IYDkN1sJxLUmfOBr85XI
-iNzQDbY0HuVE5vJj9RgwwQBkzHSrkN0wyOnbqLTh6WB9vzlKfpb+x6c834ZsoS+m
-tMhJh5R/qHnIuzF/ifRSfjX6/+WB5ym3v6UA7ZrTCq9IN36tlAT6+XK0laKZWude
-A3dusgdZC+wdGCgWnw5pdqifCkvVqChzGwIBAg==
+MIIBCAKCAQEAzPRPVQ9u6uCUpa6GgX72/eqpNYLP2+k0q5jJOAjIs9WhZ31rKO8x
+IvrNlPgLM5njI36PNHSif4U2oaLlZUiQYmwX4h0m0Aeoc8varaOtcHh53B7g4HHY
+Inz7bH58CR5EibrB+bTwHhymfb4FcrMCHH5k8RERIw8tF/IxIIF8g2SV5cMdTjMP
+XZNQtOUS4TphloRuL8XnAOcMsWImzCM3WCXcHDQg/I2brVTaeuZqMUl8TR2KEVHD
+PlpNIT7NZdkQHzA5TW6QUaUZPWHFbJx4Jpwk1Zif56r97CHbHa9/89TxA0BO1QE5
+pLLSweXGM4NrUyJFSyvZGhWouupMPDMCMwIBAg==
 -----END DH PARAMETERS-----
diff --git a/src/etc/dh-parameters.4096 b/src/etc/dh-parameters.4096
index d8e75c906..d20d3a159 100644
--- a/src/etc/dh-parameters.4096
+++ b/src/etc/dh-parameters.4096
@@ -1,13 +1,13 @@
 -----BEGIN DH PARAMETERS-----
-MIICCAKCAgEA54Nn4MUCNs8DkKQQX2YBx5TRWscWt6VoMUrgaNN4qguyR5YH94Lo
-G1NvoHcE7Y4wTyKvR2UntL11LnDNpL46VjHQpvTv5HifA6nCoHrMteDi4akK2P7t
-ai22SUZUTr6wpBbdpOD6Sm77TDEQD9Uxejsr3+4/8DxCUOMuwkm9PnxWsi4eclDf
-uziL/Jooqo5afvVo2WFtV5yVky44i1L0jRZgUmsOVvPelMM8gfwIZB8itHnQQuvB
-ZWhEYiN9dNSz0Cssr596Afp+GMRzygZF22Uc53ohSLNI7nwwu6nlllFqL34dHTo/
-E2usSgzT3wvg6FXHx7dIjxr1GViufxFiMwm2qRJ+9tBeoV7A4CKvvENfq6wJdjdD
-fRKtrNpi6dG5sAvcsw+vTJHy59wGjymyeTh0RDPWZux8vD44QM8sEEiQNskVYiU7
-+SdxktmczDyvjV0vpIfeaMqnp0mRbaamNNTpzY9kFkjtBKWsEQDOQWpm0GBMPE8/
-zEW9VtQnPIxK9PDv2NBXMklpw6uoU0cRuS/crf128Q38mqSfUHDAwmU/D3mZ54rb
-PdFdAD5TxCdEwV4VjZj+j8BKcYY0roD6Ho+f05QikBOqxkU/aelpS3qP418ETSHp
-5ibobA3Rz5ZWH526DRumt+yIILjgngOwZOo13E6c6+FW15PVdarzaLMCAQI=
+MIICCAKCAgEA0is7sUpbttQyYEnMkGHIj1FsRChRA0RSETQh9Zb8lGqoa52vMB3a
+hC0X1CGSph4+8An+PfW9XBl8YbgDAVSSlOkOaivaQTmAtKw0+AdDoml4X/DkWW47
+aZSQyLRiymoIbYq17BXHppyKtcJCMJlNyRbKeayrkoUhCSe+iYJ1TXHFsjZf3dgw
+HbbQxSt7/djzPZoAl+Y6vTPPwOJztAPfbIHhu2ZwQkwtkhqrRAHkh3ocjyGWGWK2
+CDB7ypMmliFa1gnCwl0gDA6zmSNEI4eqh67voSOyI3JWAErkrUcqZt9wesH8qv1s
+HZr86ue+G0FECCit2ONxvFRvrGzrY8CgABFouwF2+ujGk7S/f+QIrFg5NVHRkVkw
+Qyu1Hu8IZziKKcyzK/R41/QG6Mdk0to5Yz065UubRNSf4y517MmrKrzzYTJNzrzq
+g0jI3keApO7u5CJRg1YaHfukYvHSfgVYzBfelYOxQKKyYhmv4T1UqUTLvCCCMxSd
+q9nzcLnIV/lpwx2yTak6OtAj+JrgwEBdP+36htdOz2ahmfKt4jNqOed7QpCZiASz
+8Xoj4hvg2PGkk5k/L+kiqxJitZQzApB7VN+8YIIw7YTGA90CS28VhqvP9N1dKukM
+PxSuKbhZAHL3UNvcu9Ou94hvco4a4K7MCTmeITvnaxpX2kO7enXj3hsCAQI=
 -----END DH PARAMETERS-----