diff --git a/man/Makefile b/man/Makefile
index ff9f62da..daacab99 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -60,6 +60,13 @@ mosquitto-tls.7 : mosquitto-tls.7.xml
 libmosquitto.3 : libmosquitto.3.xml
 	$(XSLTPROC) $^
 
+html : *.xml
+	set -e; for m in *.xml; \
+		do \
+		hfile=$$(echo $${m} | sed -e 's#\(.*\)\.xml#\1#' | sed -e 's/\./-/g'); \
+		$(XSLTPROC) html.xsl $${m} > $${hfile}.php; \
+	done
+
 potgen :
 	 xml2po -o po/mosquitto/mosquitto.8.pot mosquitto.8.xml
 	 xml2po -o po/mosquitto.conf/mosquitto.conf.5.pot mosquitto.conf.5.xml
diff --git a/man/html.xsl b/man/html.xsl
index d25dea8f..cfea6eac 100644
--- a/man/html.xsl
+++ b/man/html.xsl
@@ -16,7 +16,7 @@
 		<xsl:call-template name="user.preroot"/>
 		<xsl:call-template name="root.messages"/>
 
-		<xsl:text disable-output-escaping="yes"><![CDATA[<?php include '_includes/bare_header.php' ?>]]></xsl:text>
+		<xsl:text disable-output-escaping="yes"><![CDATA[<?php include '../_includes/header.php' ?>]]></xsl:text>
 			<xsl:call-template name="body.attributes"/>
 			<xsl:call-template name="user.header.content">
 				<xsl:with-param name="node" select="$doc"/>
@@ -25,7 +25,7 @@
 			<xsl:call-template name="user.footer.content">
 				<xsl:with-param name="node" select="$doc"/>
 			</xsl:call-template>
-		<xsl:text disable-output-escaping="yes"><![CDATA[<?php include '_includes/bare_footer.php' ?>]]></xsl:text>
+		<xsl:text disable-output-escaping="yes"><![CDATA[<?php include '../_includes/footer.php' ?>]]></xsl:text>
 	
 		<!-- Generate any css files only once, not once per chunk -->
 		<xsl:call-template name="generate.css.files"/>