diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
index d0b8f4b22..0b4136065 100755
--- a/salt/manager/tools/sbin/soup
+++ b/salt/manager/tools/sbin/soup
@@ -569,6 +569,9 @@ upgrade_check() {
   # Let's make sure we actually need to update.
   NEWVERSION=$(cat $UPDATE_DIR/VERSION)
   HOTFIXVERSION=$(cat $UPDATE_DIR/HOTFIX)
+  if [ ! -f /etc/sohotfix ]; then
+    touch /etc/sohotfix
+  fi
   [[ -f /etc/sohotfix ]] && CURRENTHOTFIX=$(cat /etc/sohotfix)
   if [ "$INSTALLEDVERSION" == "$NEWVERSION" ]; then
     echo "Checking to see if there are hotfixes needed"
diff --git a/setup/so-setup b/setup/so-setup
index d048cc8bc..2b9a0fd01 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -577,6 +577,7 @@ if ! [[ -f $install_opt_file ]]; then
 
 	if [[ $waitforstate ]]; then
 		touch /root/accept_changes
+		touch /etc/sohotfix
 		make_some_dirs
 		percentage=0
 		es_heapsize