diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index c94ab4573..8afb51523 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -273,6 +273,7 @@ echo "shorewall control program installed in /usr/share/shorewall-lite/shorewall
 
 if [ -z "$PREFIX" ]; then
     if [ ! -L /sbin/shorewall ]; then
+	[ -f /sbin/shorewall ] && backup_file /sbin/shorewall ${PREFIX}/var/lib/shorewall-lite-${VERSION}.bkout
 	ln -sf /usr/share/shorewall-lite/shorewall /sbin/shorewall
     fi
 fi
diff --git a/Shorewall-lite/shorewall b/Shorewall-lite/shorewall
index a94b6bff7..823772472 100755
--- a/Shorewall-lite/shorewall
+++ b/Shorewall-lite/shorewall
@@ -1205,12 +1205,12 @@ export CONFIG_PATH
 get_config
 
 if [ ! -f $FIREWALL ]; then
-    echo "ERROR: Shorewall is not properly installed"
+    echo "   ERROR: Shorewall Lite is not properly installed" >&2
     if [ -L $FIREWALL ]; then
-	echo "	     $FIREWALL is a symbolic link to a"
-	echo "	     non-existant file"
+	echo "          $FIREWALL is a symbolic link to a" >&2
+	echo "          non-existant file" >&2
     else
-	echo "	     The file $FIREWALL  does not exist"
+	echo "          The file $FIREWALL does not exist" >&2
     fi
 
     exit 2
@@ -1219,8 +1219,8 @@ fi
 if [ -f $VERSION_FILE ]; then
     version=$(cat $VERSION_FILE)
 else
-    echo "ERROR: Shorewall is not properly installed"
-    echo "	 The file $VERSION_FILE does not exist"
+    echo "   ERROR: Shorewall Lite is not properly installed" >&2
+    echo "          The file $VERSION_FILE does not exist" >&2
     exit 1
 fi
 
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 85504de91..9d2553e1d 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -280,6 +280,7 @@ echo "shorewall control program installed in /usr/share/shorewall/shorewall"
 
 if [ -z "$PREFIX" ]; then
     if [ ! -L /sbin/shorewall ]; then
+	[ -f /sbin/shorewall ] && backup_file /sbin/shorewall ${PREFIX}/var/lib/shorewall-lite-${VERSION}.bkout
 	ln -sf /usr/share/shorewall/shorewall /sbin/shorewall
     fi
 fi
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index 0f051a902..57cb55f63 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -1550,12 +1550,12 @@ export CONFIG_PATH
 get_config
 
 if [ ! -f $FIREWALL ]; then
-    echo "ERROR: Shorewall is not properly installed"
+    echo "   ERROR: Shorewall is not properly installed" >&2
     if [ -L $FIREWALL ]; then
-	echo "	     $FIREWALL is a symbolic link to a"
-	echo "	     non-existant file"
+	echo "	     $FIREWALL is a symbolic link to a" >&2
+	echo "	     non-existant file" >&2
     else
-	echo "	     The file $FIREWALL  does not exist"
+	echo "	     The file $FIREWALL does not exist" >&2
     fi
 
     exit 2
@@ -1564,8 +1564,8 @@ fi
 if [ -f $VERSION_FILE ]; then
     version=$(cat $VERSION_FILE)
 else
-    echo "ERROR: Shorewall is not properly installed"
-    echo "	 The file $VERSION_FILE does not exist"
+    echo "   ERROR: Shorewall is not properly installed" >&2
+    echo "	 The file $VERSION_FILE does not exist"  >&2
     exit 1
 fi
 
diff --git a/docs/CompiledPrograms.xml b/docs/CompiledPrograms.xml
index 66af87dea..e897d1e5e 100644
--- a/docs/CompiledPrograms.xml
+++ b/docs/CompiledPrograms.xml
@@ -473,13 +473,13 @@ MANGLE_FORWARD                  # Mangle table has FORWARD chain</programlisting
 
     <para>To aid in creating this file, Shorewall Lite includes a
     <command>shorecap</command> program. The program is installed in the
-    <filename>/usr/share/shorewall/</filename> directory and may be run as
-    follows:</para>
+    <filename>/usr/share/shorewall-lite/</filename> directory and may be run
+    as follows:</para>
 
     <blockquote>
       <para><command>[ IPTABLES=&lt;iptables binary&gt; ] [
       MODULESDIR=&lt;kernel modules directory&gt; ]
-      /usr/share/shorewall/shorecap &gt; capabilities</command></para>
+      /usr/share/shorewall-lite/shorecap &gt; capabilities</command></para>
     </blockquote>
 
     <para>The IPTABLES and MODULESDIR options have their <ulink
diff --git a/docs/FAQ.xml b/docs/FAQ.xml
index ec4f6e444..b6c4753f8 100644
--- a/docs/FAQ.xml
+++ b/docs/FAQ.xml
@@ -1842,6 +1842,15 @@ eth0               eth1                        # eth1 = interface to local netwo
       <title>(FAQ 55) I just installed Shorewall but /sbin/shorewall runs
       Shorewall Lite!</title>
 
+      <para>Example:</para>
+
+      <blockquote>
+        <programlisting>wireless:/usr/share/shorewall-lite # <command>shorewall version</command>
+   ERROR: Shorewall Lite is not properly installed
+          The file /usr/share/shorewall-lite/firewall does not exist
+wireless:/usr/share/shorewall-lite #</programlisting>
+      </blockquote>
+
       <para><emphasis role="bold">Answer</emphasis>: This means that Shorewall
       Lite was already installed when you installed Shorewall and the
       /sbin/shorewall symbolic link is still pointing to the Shorewall Lite