diff --git a/xdoc/src/dtd/maven-xdoc-1.10.dtd b/xdoc/src/dtd/maven-xdoc-1.10.dtd
index 056bbe09..8a830f8d 100644
--- a/xdoc/src/dtd/maven-xdoc-1.10.dtd
+++ b/xdoc/src/dtd/maven-xdoc-1.10.dtd
@@ -1,25 +1,29 @@
 <!--
-   Xdoc DTD
+    Xdoc DTD
 
-   This is derived from XHTML version 1.0 Transitional.
-
-   For further information, see: 
+    This is based on: Extensible HTML version 1.0 Transitional DTD
+        http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd
+    For further information, see: http://www.w3.org/TR/xhtml1
 
 
-   Copyright 2001-2005 The Apache Software Foundation.
+    This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+    PUBLIC "-//Apache Software Foundation//DTD XDOC 1.0//EN"
+    SYSTEM "http://www.apache.org/dtds/xdoc_1_0.dtd"
+
+    Copyright 2006 The Apache Software Foundation.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
         http://www.apache.org/licenses/LICENSE-2.0
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
 
 <!--================ Character mnemonic entities =========================-->
diff --git a/xdoc/src/plugin-resources/dtd/maven-xdoc.dtd b/xdoc/src/plugin-resources/dtd/maven-xdoc.dtd
index 056bbe09..8a830f8d 100644
--- a/xdoc/src/plugin-resources/dtd/maven-xdoc.dtd
+++ b/xdoc/src/plugin-resources/dtd/maven-xdoc.dtd
@@ -1,25 +1,29 @@
 <!--
-   Xdoc DTD
+    Xdoc DTD
 
-   This is derived from XHTML version 1.0 Transitional.
-
-   For further information, see: 
+    This is based on: Extensible HTML version 1.0 Transitional DTD
+        http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd
+    For further information, see: http://www.w3.org/TR/xhtml1
 
 
-   Copyright 2001-2005 The Apache Software Foundation.
+    This DTD module is identified by the PUBLIC and SYSTEM identifiers:
 
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+    PUBLIC "-//Apache Software Foundation//DTD XDOC 1.0//EN"
+    SYSTEM "http://www.apache.org/dtds/xdoc_1_0.dtd"
+
+    Copyright 2006 The Apache Software Foundation.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
         http://www.apache.org/licenses/LICENSE-2.0
 
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
 
 <!--================ Character mnemonic entities =========================-->