diff --git a/openvpn-install.sh b/openvpn-install.sh
index b1f0bad..d28f5c5 100755
--- a/openvpn-install.sh
+++ b/openvpn-install.sh
@@ -211,6 +211,7 @@ else
 	cp -u -p openssl-1.0.0.cnf openssl.cnf
 	# Fuck you NSA - 1024 bits was the default for Debian Wheezy and older
 	sed -i 's|export KEY_SIZE=1024|export KEY_SIZE=4096|' /etc/openvpn/easy-rsa/2.0/vars
+	sed -i 's|export KEY_SIZE=2048|export KEY_SIZE=4096|' /etc/openvpn/easy-rsa/2.0/vars
 	# Create the PKI
 	. /etc/openvpn/easy-rsa/2.0/vars
 	. /etc/openvpn/easy-rsa/2.0/clean-all
@@ -239,6 +240,7 @@ else
 	cd /etc/openvpn/
 	# Set the server configuration
 	sed -i 's|dh dh1024.pem|dh dh4096.pem|' server.conf
+	sed -i 's|dh dh2048.pem|dh dh4096.pem|' server.conf
 	sed -i 's|;push "redirect-gateway def1 bypass-dhcp"|push "redirect-gateway def1 bypass-dhcp"|' server.conf
 	sed -i "s|port 1194|port $PORT|" server.conf
 	# DNS