diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index f8159a894..dfbad4673 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -5353,9 +5353,9 @@ define_firewall() # $1 = Command (Start or Restart)
 
     save_command 'iptables-restore << EOF'
 
-    mv -f /var/lib/shorewall/restore-$$ /var/lib/shorewall/restore-base
+    # 'shorewall save' appends the iptables-save output and 'EOF'
 
-    chmod +x /var/lib/shorewall/restore-base
+    mv -f /var/lib/shorewall/restore-$$ /var/lib/shorewall/restore-base
 
 }
 
diff --git a/Shorewall2/shorewall b/Shorewall2/shorewall
index 403738a44..5b208cecf 100755
--- a/Shorewall2/shorewall
+++ b/Shorewall2/shorewall
@@ -971,6 +971,7 @@ case "$1" in
 		    if iptables-save >> /var/lib/shorewall/restore-$$ ; then
 			echo EOF >> /var/lib/shorewall/restore-$$
 			mv -f /var/lib/shorewall/restore-$$ /var/lib/shorewall/restore
+			chmod +x /var/lib/shorewall/restore
 			echo "   Currently-running Configuration Saved"
                     else
 			rm -f /var/lib/shorewall/restore-$$