diff --git a/makedebian.pl b/makedebian.pl
index e7ab46b8c..a04705a02 100755
--- a/makedebian.pl
+++ b/makedebian.pl
@@ -285,12 +285,13 @@ fi
 host=`hostname`
 ssl=1
 atboot=1
+makeboot=1
 nochown=1
 autothird=1
 noperlpath=1
 nouninstall=1
 nostart=1
-export config_dir var_dir perl autoos port login crypt host ssl nochown autothird noperlpath nouninstall nostart allow atboot
+export config_dir var_dir perl autoos port login crypt host ssl nochown autothird noperlpath nouninstall nostart allow atboot makeboot
 tempdir=/tmp/.webmin
 if [ ! -d \$tempdir ]; then
 	tempdir=/tmp
diff --git a/setup.sh b/setup.sh
index 366297591..57b55ddb6 100755
--- a/setup.sh
+++ b/setup.sh
@@ -453,7 +453,6 @@ else
 			echo "Webmin does not support being started at boot time on your system."
 		fi
 	fi
-	makeboot=$atboot
 
 	# Copy files to target directory
 	echo "***********************************************************************"