diff --git a/makedebian.pl b/makedebian.pl
index f375787fe..b3060ae7f 100755
--- a/makedebian.pl
+++ b/makedebian.pl
@@ -260,16 +260,19 @@ system("chmod 755 $preinstall_file");
 open(SCRIPT, ">$postinstall_file");
 print SCRIPT <<EOF;
 #!/bin/sh
+killmodenone=0
 justinstalled=1
-if [ -e "/etc/$baseproduct" ]; then
+if [ -d "/etc/$baseproduct" ]; then
 	justinstalled=0
 fi
 inetd=`grep "^inetd=" /etc/$baseproduct/miniserv.conf 2>/dev/null | sed -e 's/inetd=//g'`
 if [ "\$1" = "configure" ]; then
 	# Upgrading the package, so stop the old Webmin properly
 	if [ "\$inetd" != "1" ]; then
-		if [ -e "/etc/$baseproduct/.pre-install" ]; then
+		if [ -f "/etc/$baseproduct/.pre-install" ]; then
 			/etc/$baseproduct/.pre-install >/dev/null 2>&1 </dev/null
+		else
+			killmodenone=1
 		fi
 	fi
 fi
@@ -328,7 +331,11 @@ if [ "\$inetd" != "1" ]; then
 		fi
 	else
 		if [ "$product" = "webmin" ]; then
-			/etc/$baseproduct/.post-install >/dev/null 2>&1 </dev/null
+			if [ "\$killmodenone" != "1" ]; then
+				/etc/$baseproduct/.post-install >/dev/null 2>&1 </dev/null
+			else
+				/etc/$baseproduct/.reload-init >/dev/null 2>&1 </dev/null
+			fi
 		else
 			/etc/$baseproduct/restart >/dev/null 2>&1 </dev/null
 		fi
diff --git a/makerpm.pl b/makerpm.pl
index 06f9d7767..c9cec0d41 100755
--- a/makerpm.pl
+++ b/makerpm.pl
@@ -170,11 +170,14 @@ fi
 
 %post
 inetd=`grep "^inetd=" /etc/webmin/miniserv.conf 2>/dev/null | sed -e 's/inetd=//g'`
+killmodenone=0
 if [ "\$1" != 1 ]; then
 	# Upgrading the RPM, so stop the old Webmin properly
 	if [ "\$inetd" != "1" ]; then
-		if [ -e /etc/webmin/.pre-install ]; then
+		if [ -f /etc/webmin/.pre-install ]; then
 			/etc/webmin/.pre-install >/dev/null 2>&1 </dev/null
+		else
+			killmodenone=1
 		fi
 	fi
 fi
@@ -220,7 +223,11 @@ if [ "\$inetd" != "1" ]; then
 			echo "error: Webmin server cannot be started. It is advised to start it manually\n       by running \\"/etc/webmin/restart-by-force-kill\\" command"
 		fi
 	else
-		/etc/webmin/.post-install >/dev/null 2>&1 </dev/null
+		if [ "\$killmodenone" != "1" ]; then
+			/etc/webmin/.post-install >/dev/null 2>&1 </dev/null
+		else
+			/etc/webmin/.reload-init >/dev/null 2>&1 </dev/null
+		fi
 		if [ "\$?" != "0" ]; then
 			echo "warning: Webmin server cannot be restarted. It is advised to restart it manually\n         by running \\"/etc/webmin/restart-by-force-kill\\" when upgrade process is finished"
 		fi
diff --git a/setup.pl b/setup.pl
index 086770b86..56c75ff81 100755
--- a/setup.pl
+++ b/setup.pl
@@ -110,6 +110,10 @@ $ENV{'WEBMIN_CONFIG'} = $config_directory;
 $ENV{'WEBMIN_VAR'} = "/var/webmin";	# Only used for initial load of web-lib
 require "$srcdir/web-lib-funcs.pl";
 
+# Do we need to reload instead
+# Can be deleted with Webmin 2.0
+$killmodenonepl = 0;
+
 # Check if upgrading from an old version
 if ($upgrading) {
 	print "\n";
@@ -146,6 +150,9 @@ if ($upgrading) {
 			if (-r "$config_directory/.pre-install") {
 				system("$config_directory/.pre-install >/dev/null 2>&1");
 				}
+			else {
+				$killmodenonepl = 1;
+				}
 			}
 		}
 
@@ -566,6 +573,12 @@ else {
 	# Define final start command
 	if ($upgrading) {
 		$start_cmd = "$config_directory/.post-install";
+		if ($killmodenonepl == 1) {
+			$start_cmd = "$config_directory/.reload-init";
+			}
+		else {
+			$start_cmd = "$config_directory/.post-install";
+			}
 		}
 	else {
 		$start_cmd = "$config_directory/start";
@@ -880,9 +893,14 @@ if (-r "$srcdir/setup-post.pl") {
 if (!$ENV{'nostart'}) {
 	if (!$miniserv{'inetd'}) {
 		print "Attempting to start Webmin web server..\n";
+		$action = 'start';
+		if ($upgrading) {
+			$action = 'restart';
+		}
+		print "Attempting to $action Webmin web server ..\n";
 		$ex = system($start_cmd);
 		if ($ex) {
-			&errorexit("Failed to start web server!");
+			&errorexit("Failed to $action web server!");
 			}
 		print "..done\n";
 		print "\n";
diff --git a/setup.sh b/setup.sh
index 06dbd4156..44de03eb4 100755
--- a/setup.sh
+++ b/setup.sh
@@ -614,6 +614,11 @@ if [ "$noperlpath" = "" ]; then
 	echo ""
 fi
 
+killmodenonesh=0
+if [ ! -f "$config_dir/.pre-install" ]; then
+	killmodenonesh=1
+fi
+
 # Re-generating main scripts
 echo "Creating start and stop init scripts.."
 # Start main
@@ -940,10 +945,25 @@ fi
 
 if [ "$nostart" = "" ]; then
 	if [ "$inetd" != "1" ]; then
-		echo "Attempting to start Webmin web server.."
-		$config_dir/.post-install
+		action="start"
+		if [ "$upgrading" = "1" ]; then
+			action="restart"
+		fi
+		echo "Attempting to $action Webmin web server.."
+		# If upgrading, restart
+		if [ "$upgrading" = "1" ]; then
+			if [ "$killmodenonesh" != "1" ]; then
+				$config_dir/.post-install >/dev/null 2>&1
+			else
+				$config_dir/.reload-init >/dev/null 2>&1
+			fi
+		# If installing first time, start it
+		else
+			$config_dir/start >/dev/null 2>&1
+		fi
+
 		if [ $? != "0" ]; then
-			echo "ERROR: Failed to start web server!"
+			echo "ERROR: Failed to $action web server!"
 			echo ""
 			exit 14
 		fi