diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh
index 3198597d3..ab09924ca 100755
--- a/Shorewall-lite/install.sh
+++ b/Shorewall-lite/install.sh
@@ -326,6 +326,30 @@ echo "Help command executor installed in ${PREFIX}/usr/share/shorewall-lite/help
 run_install $OWNERSHIP -m 0600 modules ${PREFIX}/usr/share/shorewall-lite/modules
 echo "Modules file installed as ${PREFIX}/usr/share/shorewall-lite/modules"
 
+#
+# Install the Man Pages
+#
+
+rm -f *.gz
+
+cd manpages
+
+for f in *.5; do
+    gzip $f
+    run_install -D $f.gz ${PREFIX}/usr/share/man/man5/$f.gz
+    echo "Man page $f.gz installed to /usr/share/man/man5/$f.gz"
+done
+
+for f in *.8; do
+    gzip $f
+    run_install -D $f.gz ${PREFIX}/usr/share/man/man8/$f.gz
+    echo "Man page $f.gz installed to /usr/share/man/man8/$f.gz"
+done
+
+cd ..
+
+echo "Man Pages Installed"
+
 #
 # Create the version file
 #
diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec
index f81b02d78..6b99405e2 100644
--- a/Shorewall-lite/shorewall-lite.spec
+++ b/Shorewall-lite/shorewall-lite.spec
@@ -82,6 +82,32 @@ fi
 %attr(0544,root,root) /usr/share/shorewall-lite/shorecap
 %attr(0544,root,root) /usr/share/shorewall-lite/help
 
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-accounting.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-actions.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-blacklist.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall.conf.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-hosts.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-interfaces.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-maclist.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-masq.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-nat.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-netmap.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-params.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-policy.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-providers.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-proxyarp.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-route_rules.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-routestopped.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-rules.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-tcclasses.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-tcdevices.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-tcrules.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-tos.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-tunnels.5.gz
+%attr(0x444,root,root) %{_mandir}/man5/shorewall-zones.5.gz
+
+%attr(0x444,root,root) %{_mandir}/man8/shorewall-lite.8.gz
+
 %doc COPYING changelog.txt releasenotes.txt
 
 %changelog
diff --git a/manpages-lite/shorewall.conf.xml b/manpages-lite/shorewall.conf.xml
index 786764d31..2fdc80456 100644
--- a/manpages-lite/shorewall.conf.xml
+++ b/manpages-lite/shorewall.conf.xml
@@ -14,38 +14,36 @@
 
   <refsynopsisdiv>
     <cmdsynopsis>
-      <command>/etc/shorewall/shorewall.conf</command>
+      <command>/etc/shorewall-lite/shorewall.conf</command>
     </cmdsynopsis>
   </refsynopsisdiv>
 
   <refsect1>
     <title>Description</title>
 
-    <para>This file sets options that apply to Shorewall as a whole.</para>
+    <para>This file sets options that apply to Shorewall-lite as a
+    whole.</para>
 
     <para>The file consists of Shell comments (lines beginning with '#'),
     blank lines and assignment statements
     (<emphasis>variable</emphasis>=<emphasis>value</emphasis>). Each
     variable's setting is preceded by comments that describe the variable and
     it's effect.</para>
+
+    <para>If an option is not set in this file, or if it is set to the null
+    value, then the corresponding setting in the shorewall.conf file in this
+    firewall's export directory will be used.</para>
   </refsect1>
 
   <refsect1>
     <title>FILES</title>
 
-    <para>/etc/shorewall/shorewall.conf</para>
+    <para>/etc/shorewall-lite/shorewall.conf</para>
   </refsect1>
 
   <refsect1>
     <title>See ALSO</title>
 
-    <para>shorewall(8), shorewall-accounting(5), shorewall-actions(5),
-    shorewall-blacklist(5), shorewall-hosts(5), shorewall-interfaces(5),
-    shorewall-ipsec(5), shorewall-maclist(5), shorewall-masq(5),
-    shorewall-nat(5), shorewall-netmap(5), shorewall-params(5),
-    shorewall-policy(5), shorewall-providers(5), shorewall-proxyarp(5),
-    shorewall-route_rules(5), shorewall-routestopped(5), shorewall-rules(5),
-    shorewall-tcclasses(5), shorewall-tcdevices(5), shorewall-tcrules(5),
-    shorewall-tos(5), shorewall-tunnels(5), shorewall-zones(5)</para>
+    <para>shorewall-lite(8)</para>
   </refsect1>
 </refentry>
\ No newline at end of file
diff --git a/tools/build/makeshorewall b/tools/build/makeshorewall
index 833c50762..62d65134d 100755
--- a/tools/build/makeshorewall
+++ b/tools/build/makeshorewall
@@ -86,6 +86,7 @@ SAMPLESTAG=
 HASLITE=
 SIGN=
 MANPAGETAG=
+LITEMANPAGETAG=
 ################################################################################
 #                               F U N C T I O N S
 ################################################################################
@@ -239,6 +240,7 @@ case $VERSION in
 	SAMPLESTAG="trunk/Samples"
 	HASLITE=Yes
 	MANPAGETAG=trunk/manpages
+	LITEMANPAGETAG=trunk/manpages-lite
 	;;
    *)
 	echo "Unsupported Version: $VERSION"
@@ -341,6 +343,19 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
 	done
 	rm *.xml
 	cd $DIR
+
+	cd $SHOREWALLLITEDIR
+	mkdir manpages
+	cp -f $SHOREWALLDIR/manpages/*.[58] manpages
+	cd manpages
+	for f in *.xml; do
+	    if [ $f != shorewall-template.xml ]; then
+		progress_message "Generating Man Page from $f..."
+		docbook-to-man $f
+	    fi
+	done
+	rm *.xml
+	cd $DIR 
     fi	
 
     do_or_die "rm -rf $SHOREWALLDIR/debian"