diff --git a/src/etc/inc/openvpn.inc b/src/etc/inc/openvpn.inc
index 9e87170262..2be9b373fa 100644
--- a/src/etc/inc/openvpn.inc
+++ b/src/etc/inc/openvpn.inc
@@ -103,7 +103,8 @@ $openvpn_verbosity_level = array(
 
 global $openvpn_dh_lengths;
 $openvpn_dh_lengths = array(
-	1024, 2048, 4096);
+	1024, 2048, 3072, 4096, 7680, 8192, 15360, 16384
+);
 
 global $openvpn_cert_depths;
 $openvpn_cert_depths = array(
diff --git a/src/usr/local/www/wizards/openvpn_wizard.xml b/src/usr/local/www/wizards/openvpn_wizard.xml
index a4498bd25f..3c7ce70207 100644
--- a/src/usr/local/www/wizards/openvpn_wizard.xml
+++ b/src/usr/local/www/wizards/openvpn_wizard.xml
@@ -367,7 +367,7 @@
 		<field>
 			<name>keylength</name>
 			<displayname>Key length</displayname>
-			<description>&lt;br/&gt;Size of the key which will be generated. The larger the key, the more security it offers, but larger keys are generally slower to use.</description>
+			<description>&lt;br/&gt;Size of the key which will be generated. The larger the key, the more security it offers, but larger keys take considerably more time to generate, and take slightly longer to validate leading to a slight slowdown in setting up new sessions (not always noticeable). As of 2016, 2048 bit is the minimum and most common selection and 4096 is the maximum in common use. For more information see &lt;a href="https://keylength.com"&gt;keylength.com&lt;/a&gt;</description>
 			<type>select</type>
 			<value>2048</value>
 			<bindstofield>ovpnserver->step6->keylength</bindstofield>
@@ -384,10 +384,30 @@
 					<name>2048 bit</name>
 					<value>2048</value>
 				</option>
+				<option>
+					<name>3072 bit</name>
+					<value>3072</value>
+				</option>
 				<option>
 					<name>4096 bit</name>
 					<value>4096</value>
 				</option>
+				<option>
+					<name>7680 bit</name>
+					<value>7680</value>
+				</option>
+				<option>
+					<name>8192 bit</name>
+					<value>8192</value>
+				</option>
+				<option>
+					<name>15360 bit</name>
+					<value>15360</value>
+				</option>
+				<option>
+					<name>16384 bit</name>
+					<value>16384</value>
+				</option>
 			</options>
 		</field>
 		<field>