diff --git a/doc/Makefile b/doc/Makefile
new file mode 100644
index 00000000..43d82b8e
--- /dev/null
+++ b/doc/Makefile
@@ -0,0 +1,45 @@
+FOP = /opt/fop/fop.sh
+XALAN = /opt/fop/xalan.sh
+JAVA_HOME = /usr/lib/jvm/java-6-sun
+
+ALLDOCS = modsecurity2-apache-reference.pdf modsecurity2-data-formats.pdf modsecurity2-apache-reference.html modsecurity2-data-formats.html html-multipage/index.html index.html
+
+all: $(ALLDOCS)
+
+modsecurity2-apache-reference.pdf: modsecurity2-apache-reference.xml
+	JAVA_HOME=$(JAVA_HOME); export JAVA_HOME; \
+	$(FOP) -q -xsl pdf.xsl -xml modsecurity2-apache-reference.xml -pdf modsecurity2-apache-reference.pdf;
+
+modsecurity2-data-formats.pdf: modsecurity2-data-formats.xml
+	JAVA_HOME=$(JAVA_HOME); export JAVA_HOME; \
+	$(FOP) -q -xsl pdf.xsl -xml modsecurity2-data-formats.xml -pdf modsecurity2-data-formats.pdf;
+
+modsecurity2-apache-reference.html: modsecurity2-apache-reference.xml
+	JAVA_HOME=$(JAVA_HOME); export JAVA_HOME; \
+	$(XALAN) -q -xsl html.xsl -in modsecurity2-apache-reference.xml -param base.dir ./; \
+	mv index.html modsecurity2-apache-reference.html;
+
+modsecurity2-data-formats.html: modsecurity2-data-formats.xml
+	JAVA_HOME=$(JAVA_HOME); export JAVA_HOME; \
+	$(XALAN) -q -xsl html.xsl -in modsecurity2-data-formats.xml -param base.dir ./; \
+	mv index.html modsecurity2-data-formats.html;
+
+html-multipage/index.html: modsecurity2-apache-reference.xml
+	JAVA_HOME=$(JAVA_HOME); export JAVA_HOME; \
+	mkdir html-multipage/; \
+	$(XALAN) -q -xsl html-chunked.xsl -in modsecurity2-apache-reference.xml -param base.dir html-multipage/; \
+	cp modsecurity-reference.css html-multipage/; \
+	cp modsecurity.gif html-multipage/; \
+	cp breach-logo-small.gif html-multipage/; \
+	cp apache_request_cycle-modsecurity.jpg html-multipage/
+
+index.html: main-index.html
+	(cp main-index.html index.html && \
+	VERSION=`grep "<releaseinfo>.*</releaseinfo>" modsecurity2-apache-reference.xml | sed 's/[ \t]*<\/\?releaseinfo>[ \t]*//g'` && \
+	perl -pi -e "s/\\\$$version/$$VERSION/" index.html)
+
+clean:
+	rm -rf docindex.html $(ALLDOCS) html-multipage
+
+.PHONY: setup cleanup
+
diff --git a/doc/html-chunked.xsl b/doc/html-chunked.xsl
index 739ca0e1..2c42ecf1 100644
--- a/doc/html-chunked.xsl
+++ b/doc/html-chunked.xsl
@@ -1,8 +1,8 @@
 <?xml version='1.0'?> 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<!--xsl:import href="/opt/docbook/xsl/html/chunk.xsl"/-->
-<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl"/>
+<xsl:import href="/opt/docbook/xsl/html/chunk.xsl"/>
+<!--xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl"/-->
 
 <xsl:param name="chunk.first.sections" select="1"/>
 <xsl:param name="use.id.as.filename" select="1"/>
diff --git a/doc/html.xsl b/doc/html.xsl
index b1cd6183..a3b50930 100644
--- a/doc/html.xsl
+++ b/doc/html.xsl
@@ -1,8 +1,8 @@
 <?xml version='1.0'?> 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<!--xsl:import href="/opt/docbook/xsl/html/onechunk.xsl"/-->
-<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/onechunk.xsl"/>
+<xsl:import href="/opt/docbook/xsl/html/onechunk.xsl"/>
+<!--xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/onechunk.xsl"/-->
 
 <xsl:template name="user.header.navigation">
     <div style="background:#F5F5F5;width:100%;border-top:1px solid #DDDDDD;border-bottom:1px solid #DDDDDD"><table cellpadding="0" cellspacing="0" width="100%"><tr><td><a href="http://www.modsecurity.org"><img border="0" alt="ModSecurity" height="36" width="120" src="modsecurity.gif" style="margin:4px"/></a></td><td align="right"><a href="http://www.breach.com"><img border="0" width="100" height="36" src="breach-logo-small.gif" style="margin:6px"/></a></td></tr></table></div>	
diff --git a/doc/index.html b/doc/main-index.html
similarity index 97%
rename from doc/index.html
rename to doc/main-index.html
index 85c74eed..321caa01 100644
--- a/doc/index.html
+++ b/doc/main-index.html
@@ -18,7 +18,7 @@ height="36" width="100" border="0"></a></td></tr></table>
 
         <h2>ModSecurity for Apache Documentation</h2>
 
-        <p>Version $version</p>
+        <p>$version</p>
 
         <ul>
             <li><a href="html-multipage/index.html">HTML, one page per chapter</a></li>
diff --git a/doc/pdf.xsl b/doc/pdf.xsl
index b0ace8a3..b7b70c17 100644
--- a/doc/pdf.xsl
+++ b/doc/pdf.xsl
@@ -5,8 +5,8 @@
     version="1.0"
 >
 
-<!--xsl:import href="/opt/docbook/xsl/fo/docbook.xsl"/-->
-<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl"/>
+<xsl:import href="/opt/docbook/xsl/fo/docbook.xsl"/>
+<!--xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl"/-->
 
 <xsl:param name="paper.type" select="A4"/>