diff --git a/config/rootfiles/core/185/update.sh b/config/rootfiles/core/185/update.sh
index 2c95c4102..247661481 100644
--- a/config/rootfiles/core/185/update.sh
+++ b/config/rootfiles/core/185/update.sh
@@ -35,6 +35,17 @@ done
 /etc/init.d/ntp stop
 /etc/init.d/squid stop
 
+# OpenVPN add and change new 2.6.x directives for NCP.
+if pgrep openvpn > /dev/null; then
+	/usr/local/bin/openvpnctrl -k > /dev/null
+	sed -i 's/^ncp-disable/data-ciphers ChaCha20-Poly1305:AES-256-GCM/' /var/ipfire/ovpn/server.conf
+	sed -i 's/^cipher/data-ciphers-fallback/' /var/ipfire/ovpn/server.conf
+	/usr/local/bin/openvpnctrl -s > /dev/null
+else
+	sed -i 's/^ncp-disable/data-ciphers ChaCha20-Poly1305:AES-256-GCM/' /var/ipfire/ovpn/server.conf
+	sed -i 's/^cipher/data-ciphers-fallback/' /var/ipfire/ovpn/server.conf
+fi
+
 # Extract files
 extract_files