diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec
index 410cb4eac..591acb7c6 100644
--- a/Shorewall-lite/shorewall-lite.spec
+++ b/Shorewall-lite/shorewall-lite.spec
@@ -48,7 +48,7 @@ if [ $1 -eq 1 ]; then
 	fi
 fi
 
-[ -L /sbin/shorewall ] || ln -s /usr/share/shorewall-lite/shorewall /sbin/shorewall
+[ -L /sbin/shorewall ] || [ -f /sbin/shorewall ] || ln -s /usr/share/shorewall-lite/shorewall /sbin/shorewall
 
 %preun
 
@@ -61,6 +61,12 @@ if [ $1 = 0 ]; then
 
 fi
 
+%triggerpostun -- shorewall-lite <= 3.2.0-0RC1
+
+if [ -f /usr/share/shorewall-lite/shorewall ]; then
+   [ -L /sbin/shorewall ] || ln -s /usr/share/shorewall-lite/shorewall /sbin/shorewall
+fi
+
 %files
 %defattr(0644,root,root,0755)
 %attr(0755,root,root) %dir /etc/shorewall-lite
diff --git a/Shorewall-lite/shorewall.conf b/Shorewall-lite/shorewall.conf
index 5a3ce3ca7..a6d307f53 100644
--- a/Shorewall-lite/shorewall.conf
+++ b/Shorewall-lite/shorewall.conf
@@ -1,10 +1,10 @@
 ###############################################################################
-#  /etc/shorewall/shorewall.conf V3.0 - Change the following variables to
+#  /etc/shorewall-lite/shorewall.conf V3.0 - Change the following variables to
 #  match your setup
 #
 #  This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
 #
-#  This file should be placed in /etc/shorewall
+#  This file should be placed in /etc/shorewall-lite
 #
 #  (c) 2006 - Tom Eastep (teastep@shorewall.net)
 #
diff --git a/Shorewall/compiler b/Shorewall/compiler
index 7cf9945a9..2dc1ce4bc 100755
--- a/Shorewall/compiler
+++ b/Shorewall/compiler
@@ -8281,9 +8281,9 @@ __EOF__
 __EOF__
    else
 	cat >&3 << __EOF__
-    [ -z "\$IPTABLES\" ] && IPTABLES=\$(mywhich iptables 2> /dev/null)
+    [ -z "\$IPTABLES" ] && IPTABLES=\$(mywhich iptables 2> /dev/null)
 
-    [ -n \"$IPTABLES\" -a -e "\$IPTABLES" ] || startup_error "Can't find iptables executable"
+    [ -n "\$IPTABLES" -a -e "\$IPTABLES" ] || startup_error "Can't find iptables executable"
 __EOF__
     fi
 
diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec
index 8537caa56..da494574d 100644
--- a/Shorewall/shorewall.spec
+++ b/Shorewall/shorewall.spec
@@ -48,7 +48,7 @@ if [ $1 -eq 1 ]; then
 	fi
 fi
 
-[ -L /sbin/shorewall ] || ln -s /usr/share/shorewall/shorewall /sbin/shorewall
+[ -L /sbin/shorewall ] || [ -f /sbin/shorewall] || ln -s /usr/share/shorewall/shorewall /sbin/shorewall
 
 %preun
 
@@ -63,6 +63,12 @@ if [ $1 = 0 ]; then
 
 fi
 
+%triggerpostun -- shorewall <= 3.2.0-0RC1
+
+if [ -f /usr/share/shorewall/shorewall ]; then
+   [ -L /sbin/shorewall ] || ln -s /usr/share/shorewall/shorewall /sbin/shorewall
+fi
+
 %files
 %defattr(0644,root,root,0755)
 %attr(0544,root,root) /etc/init.d/shorewall
diff --git a/tools/build/makeshorewall b/tools/build/makeshorewall
index 8fe16d061..cdeaf3401 100755
--- a/tools/build/makeshorewall
+++ b/tools/build/makeshorewall
@@ -59,7 +59,7 @@ DIR=$PWD
 #
 # location and options for GnuPG
 #
-GPG="/usr/bin/gpg -ab --batch --comment 'To verify this, you can download our public key at https://lists.shorewall.net/shorewall.gpg.key'"
+GPG="/usr/bin/gpg -ab --no-use-agent --comment 'To verify this, you can download our public key at https://lists.shorewall.net/shorewall.gpg.key'"
 ################################################################################
 #                               V A R I A B L E S
 ################################################################################