diff --git a/Makefile b/Makefile
index 01b8df5b6..974275be8 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,9 @@ lfs:
 
 	sh goTidy $(BASEDIR)/
 
+	for filename in `find $(BASEDIR) -name "*.html"`; do \
+	  sed -i -e "s@text/html@application/xhtml+xml@g" $$filename; \
+	done;
 #
 # This is the old "pdf" target. The old "print" target below has been
 # renamed to "pdf" and will be used. This commented out previous_pdf
diff --git a/stylesheets/lfs-chunked2.xsl b/stylesheets/lfs-chunked2.xsl
index 43d5eecec..7bf7d7bc5 100644
--- a/stylesheets/lfs-chunked2.xsl
+++ b/stylesheets/lfs-chunked2.xsl
@@ -23,8 +23,8 @@
     <!-- Dropping some unwanted style attributes -->
   <xsl:param name="ulink.target" select="''"></xsl:param>
   <xsl:param name="css.decoration" select="0"></xsl:param>
-  
+
     <!-- No XML declaration -->
-  <xsl:param name="chunker.output.omit-xml-declaration" select="'yes'"/>
+<!--  <xsl:param name="chunker.output.omit-xml-declaration" select="'yes'"/> -->
 
 </xsl:stylesheet>