diff --git a/docs/Makefile b/docs/Makefile
index 8383a0b4478..eb3bb41bfcf 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -41,6 +41,7 @@ help:
 
 $(DOCBOOKDIR)/Samba-Guide.xml: $(filter-out Samba-Guide/index.xml,$(wildcard Samba-Guide/*.xml))
 $(DOCBOOKDIR)/Samba-HOWTO-Collection.xml: $(filter-out Samba-HOWTO-Collection/index.xml,$(wildcard Samba-HOWTO-Collection/*.xml)) Samba-HOWTO-Collection-attributions.xml
+Samba-HOWTO-Collection/manpages.xml: $(MANPAGEDIR)/smb.conf.5.xml
 $(DOCBOOKDIR)/Samba-Developers-Guide.xml: $(filter-out Samba-Developers-Guide/index.xml,$(wildcard Samba-Developers-Guide/*.xml)) Samba-Developers-Guide-attributions.xml
 
 # Pseudo targets 
diff --git a/docs/Samba-HOWTO-Collection/index.xml b/docs/Samba-HOWTO-Collection/index.xml
index eb906dc29db..6f262bf0767 100644
--- a/docs/Samba-HOWTO-Collection/index.xml
+++ b/docs/Samba-HOWTO-Collection/index.xml
@@ -141,14 +141,15 @@ The chapters in this part each cover specific Samba features.
 <part id="Appendix">
 <title>Appendixes</title>
 
+<!-- Comment out the following line to include the manpages.
+	 *Please* do not commit with the line below enabled! -->
+<!--<xi:include href="manpages.xml"/>-->
 	<xi:include href="TOSHARG-Compiling.xml"/>
 	<xi:include href="TOSHARG-Portability.xml"/>
 	<xi:include href="TOSHARG-Other-Clients.xml"/>
 	<xi:include href="TOSHARG-Speed.xml"/>
 	<xi:include href="TOSHARG-DNS-DHCP-Configuration.xml"/>
 
-</part>
-
 	<xi:include href="http://www.gnu.org/licenses/gpl.xml"/>
 
 	<xi:include href="TOSHARG-glossary.xml"/>
@@ -156,5 +157,6 @@ The chapters in this part each cover specific Samba features.
 	<?latex \chaptermark{Subject index} ?>
 
 	<index/>
+</part>
 
 </book>
diff --git a/docs/Samba-HOWTO-Collection/manpages.xml b/docs/Samba-HOWTO-Collection/manpages.xml
new file mode 100644
index 00000000000..be7e189ef44
--- /dev/null
+++ b/docs/Samba-HOWTO-Collection/manpages.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE reference PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<reference id="manuals" xmlns:xi="http://www.w3.org/2003/XInclude">                                 <title>Manual pages</title>
+
+	<para>This appendix contains most of the manual pages from the official Samba distribution. All manual pages have been written by members of 
+		<ulink url="http://samba.org/samba/team.html">the Samba Team</ulink>.</para>
+
+	<xi:include href="../manpages/smb.conf.5.xml"/>
+	<xi:include href="../manpages/nmblookup.1.xml"/>
+	<xi:include href="../manpages/rpcclient.1.xml"/>
+	<xi:include href="../manpages/smbcacls.1.xml"/>
+	<xi:include href="../manpages/smbcacls.1.xml"/>
+	<xi:include href="../manpages/net.8.xml"/>
+	<xi:include href="../manpages/nmbd.8.xml"/>
+	<xi:include href="../manpages/pdbedit.8.xml"/>
+	<xi:include href="../manpages/smbcquotas.1.xml"/>
+	<xi:include href="../manpages/smbd.8.xml"/>
+	<xi:include href="../manpages/smbpasswd.5.xml"/>
+	<xi:include href="../manpages/smbpasswd.8.xml"/>
+	<xi:include href="../manpages/smbstatus.1.xml"/>
+	<xi:include href="../manpages/smbtree.1.xml"/>
+	<xi:include href="../manpages/testparm.1.xml"/>
+	<xi:include href="../manpages/wbinfo.1.xml"/>
+	<xi:include href="../manpages/winbindd.8.xml"/>
+
+</reference>