diff --git a/Shorewall/compiler b/Shorewall/compiler
index f1fc14eaa..ac3cb7fb6 100755
--- a/Shorewall/compiler
+++ b/Shorewall/compiler
@@ -5521,7 +5521,7 @@ __EOF__
 # Shorewall auxiliary configuration file created by Shorewall version $VERSION - $(date)
 #
 __EOF__
-	    for option in VERBOSITY LOGFILE LOGFORMAT IPTABLES PATH SHOREWALL_SHELL SUBSYSLOCK RESTOREFILE; do
+	    for option in VERBOSITY LOGFILE LOGFORMAT IPTABLES PATH SHOREWALL_SHELL SUBSYSLOCK RESTOREFILE SAVE_IPSETS; do
 		conditionally_add_option $option
 	    done
 
diff --git a/Shorewall/lib.cli b/Shorewall/lib.cli
index 3882c1b69..e1cbbfada 100644
--- a/Shorewall/lib.cli
+++ b/Shorewall/lib.cli
@@ -265,7 +265,7 @@ save_config() {
 	    echo "   ERROR: $RESTOREPATH exists and is not a saved $PRODUCT configuration"
 	else
 	    case $RESTOREFILE in
-		save)
+		.*|capabilities|chains|default_route|firewall|firewall.conf|nat|proxyarp|restarted|rt_tables|save|state|undo_routing|zones)
 		    echo "   ERROR: Reserved file name: $RESTOREFILE"
 		    ;;
 		*)