diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index c7e9364f..36d88c52 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -304,7 +304,7 @@
         <x:parse var="doc" xml="${file}"/>
 
         <j:file name="${outFile}" encoding="${outputencoding}"
-          omitXmlDeclaration="false" outputMode="xml"
+          omitXmlDeclaration="true" outputMode="xml"
           prettyPrint="no">
           <j:include uri="${stylesheet.toString()}"/>
         </j:file>
diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl
index e40b3fa5..7794412d 100644
--- a/xdoc/src/plugin-resources/site.jsl
+++ b/xdoc/src/plugin-resources/site.jsl
@@ -23,10 +23,9 @@
   		location="${location}"/>
 	
 	<x:doctype name="html"
-      publicId="-//W3C//DTD XHTML 1.0 Transitional//EN"
-      systemId="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
+      publicId="-//CollabNet//DTD XHTML 1.0 Transitional//EN"
+      systemId="http://www.collabnet.com/dtds/collabnet_transitional_10.dtd"/>
 
-	<!--  JSL currently hoses this - xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" -->
     <html>
       <head>
         <j:set var="docTitle">
@@ -63,8 +62,8 @@
         -->
         <link rel="stylesheet" type="text/css" href="${relativePath}/style/print.css" media="print"/>
         <x:forEach var="author" select="./properties/author">
-          <meta name="author" content="${author.text}"/>
-          <meta name="email" content="${author.attribute('email').value}"/>
+          <meta name="author" value="${author.text}"/>
+          <meta name="email" value="${author.attribute('email').value}"/>
         </x:forEach>
         
         <jsl:applyTemplates select="$doc/document/head"/>
@@ -73,6 +72,8 @@
 
       <x:element name="body"><j:whitespace trim="true">
         <x:attribute name="class">composite</x:attribute>
+        <x:attribute name="marginwidth">0</x:attribute>
+        <x:attribute name="marginheight">0</x:attribute>
         <x:forEach var="attr" select="$doc/document/body/@*">
           <x:attribute name="${attr.name}">${attr.value}</x:attribute>
         </x:forEach>
@@ -308,7 +309,7 @@
                 <j:set var="poweredbyurl">${maven.xdoc.poweredby.url}</j:set>
                 <j:if test="${!empty(poweredbyimage)}">
                 	<div style="margin-top: 20px; width: 100%; text-align: center;">
-                		<a href="${poweredbyurl}" title="${poweredbytitle}"><img alt="${maven.xdoc.poweredby.title}" style="border: 1px solid black" src="${relativePath}/images/logos/${poweredbyimage}"/></a>
+                		<a href="${poweredbyurl}" title="${poweredbytitle}"><img style="border: 1px solid black" src="${relativePath}/images/logos/${poweredbyimage}"/></a>
                 	</div>
                 </j:if>
               
