diff --git a/src/etc/rc.initial b/src/etc/rc.initial
index 051c799ac..fce900f16 100755
--- a/src/etc/rc.initial
+++ b/src/etc/rc.initial
@@ -87,7 +87,7 @@ case ${opmode} in
 	/usr/sbin/tcpdump -s 256 -v -S -l -n -e -ttt -i pflog0
 	;;
 11)
-	/usr/local/etc/rc.restart_webgui
+	/usr/local/etc/rc.restart_webgui please
 	;;
 12)
 	/usr/local/etc/rc.initial.firmware
diff --git a/src/etc/rc.initial.firmware b/src/etc/rc.initial.firmware
index bcc316c58..f5f10f6c3 100755
--- a/src/etc/rc.initial.firmware
+++ b/src/etc/rc.initial.firmware
@@ -47,7 +47,7 @@ pkg upgrade -y
 echo
 
 # restart the GUI after PHP changes have been applied
-/usr/local/etc/rc.restart_webgui
+/usr/local/etc/rc.restart_webgui please
 
 echo
 
diff --git a/src/etc/rc.initial.setlanip b/src/etc/rc.initial.setlanip
index 6837e50d5..cf4540745 100755
--- a/src/etc/rc.initial.setlanip
+++ b/src/etc/rc.initial.setlanip
@@ -459,9 +459,8 @@ if (!$dry_run) {
 		echo "\n DHCPD...";
 		services_dhcpd_configure();
 	}
-	if($restart_webgui) {
-		echo "\n Restarting webConfigurator... ";
-		mwexec("/usr/local/etc/rc.restart_webgui");
+	if ($restart_webgui) {
+		mwexec('/usr/local/etc/rc.restart_webgui please');
 	}
 }
 
diff --git a/src/etc/rc.restart_webgui b/src/etc/rc.restart_webgui
index eaf397a2f..77fadf57f 100755
--- a/src/etc/rc.restart_webgui
+++ b/src/etc/rc.restart_webgui
@@ -11,6 +11,14 @@ echo "Restarting webConfigurator...";
 
 killbyname("lighttpd");
 
+if ($argc > 1) {
+	/*
+	 * Force killing all php-cgi children as well
+	 * to avoid hiccups with moved include files.
+	 */
+	killbyname("php-cgi");
+}
+
 while (is_process_running("lighttpd")) {
         echo '.';
         sleep(1);