diff --git a/config/rootfiles/core/91/update.sh b/config/rootfiles/core/91/update.sh
index 866711260..e3341d2d3 100644
--- a/config/rootfiles/core/91/update.sh
+++ b/config/rootfiles/core/91/update.sh
@@ -31,6 +31,9 @@ do
 	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
 done
 
+# Stop services
+/etc/init.d/ipsec stop
+
 # Extract files
 extract_files
 
@@ -41,8 +44,16 @@ chmod 777 /srv/web/ipfire/html/{accounting,graphs}
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
+# Regenerate IPsec configuration
+sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
+
 sync
 
+# Start services
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+	/etc/init.d/ipsec start
+fi
+
 # This update need a reboot...
 #touch /var/run/need_reboot