diff --git a/src/documentation/xdocs/3rdparty.xml b/src/documentation/xdocs/3rdparty.xml
index 2ca5d12f6..25d983f95 100644
--- a/src/documentation/xdocs/3rdparty.xml
+++ b/src/documentation/xdocs/3rdparty.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
  <header>
diff --git a/src/documentation/xdocs/book.xml b/src/documentation/xdocs/book.xml
index 1c6f4546a..28a3bbc48 100644
--- a/src/documentation/xdocs/book.xml
+++ b/src/documentation/xdocs/book.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "dtd/book-cocoon-v10.dtd">
+<!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "./dtd/book-cocoon-v10.dtd">
 
 <book software="Poi" 
       title="Poi Project Documentation" 
diff --git a/src/documentation/xdocs/changes.xml b/src/documentation/xdocs/changes.xml
index 1827f569c..36223b2ff 100644
--- a/src/documentation/xdocs/changes.xml
+++ b/src/documentation/xdocs/changes.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-
-<!DOCTYPE changes PUBLIC "-//APACHE//DTD Changes V1.1//EN" "dtd/changes-v11.dtd">
+<!DOCTYPE changes PUBLIC "-//APACHE//DTD Changes V1.1//EN" "./dtd/changes-v11.dtd">
 
 <changes title="History of Changes">
 
diff --git a/src/documentation/xdocs/contrib.xml b/src/documentation/xdocs/contrib.xml
index 42d8f6f92..22b96c9fd 100644
--- a/src/documentation/xdocs/contrib.xml
+++ b/src/documentation/xdocs/contrib.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
  <header>
diff --git a/src/documentation/xdocs/faq.xml b/src/documentation/xdocs/faq.xml
index bdc642008..79b63a6b3 100644
--- a/src/documentation/xdocs/faq.xml
+++ b/src/documentation/xdocs/faq.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE faqs PUBLIC "-//APACHE//DTD FAQ V1.1//EN" "dtd/faq-v11.dtd">
+<!DOCTYPE faqs PUBLIC "-//APACHE//DTD FAQ V1.1//EN" "./dtd/faq-v11.dtd">
 
 <faqs title="Frequently Asked Questions">
     <faq>
diff --git a/src/documentation/xdocs/historyandfuture.xml b/src/documentation/xdocs/historyandfuture.xml
index d545bac23..ae26b195c 100755
--- a/src/documentation/xdocs/historyandfuture.xml
+++ b/src/documentation/xdocs/historyandfuture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
   <header>
diff --git a/src/documentation/xdocs/index.xml b/src/documentation/xdocs/index.xml
index 40e18c525..04a727d1d 100644
--- a/src/documentation/xdocs/index.xml
+++ b/src/documentation/xdocs/index.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
   <header>
diff --git a/src/documentation/xdocs/inthenews.xml b/src/documentation/xdocs/inthenews.xml
index b05714042..9e8a27a60 100644
--- a/src/documentation/xdocs/inthenews.xml
+++ b/src/documentation/xdocs/inthenews.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
   <header>
diff --git a/src/documentation/xdocs/livesites.xml b/src/documentation/xdocs/livesites.xml
index 1b1a31eae..e7586f075 100644
--- a/src/documentation/xdocs/livesites.xml
+++ b/src/documentation/xdocs/livesites.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
     <header>
diff --git a/src/documentation/xdocs/mail-archives.xml b/src/documentation/xdocs/mail-archives.xml
index ccca4f6bb..d5ecae703 100644
--- a/src/documentation/xdocs/mail-archives.xml
+++ b/src/documentation/xdocs/mail-archives.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
  <header>
diff --git a/src/documentation/xdocs/mail-lists.xml b/src/documentation/xdocs/mail-lists.xml
index 8bc579601..1d011521f 100644
--- a/src/documentation/xdocs/mail-lists.xml
+++ b/src/documentation/xdocs/mail-lists.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
  <header>
diff --git a/src/documentation/xdocs/overview.xml b/src/documentation/xdocs/overview.xml
index 1416800e3..36e5a7de7 100644
--- a/src/documentation/xdocs/overview.xml
+++ b/src/documentation/xdocs/overview.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
   <header>
diff --git a/src/documentation/xdocs/patches.xml b/src/documentation/xdocs/patches.xml
index b3c58299f..b12b454e4 100644
--- a/src/documentation/xdocs/patches.xml
+++ b/src/documentation/xdocs/patches.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-      
-        <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" 
-         "dtd/document-v10.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
       
     <document><header><title>Patch Queue</title><authors><person email="greenrd@hotmail.com" name="Robin Green"/><person email="barozzi@nicolaken.com" name="Nicola Ken Barozzi"/></authors></header><body><s1 title="Introduction"><p>
        This is an <strong>informal</strong> list - in chronological order -
diff --git a/src/documentation/xdocs/todo.xml b/src/documentation/xdocs/todo.xml
index 74498255d..ae51e4fef 100644
--- a/src/documentation/xdocs/todo.xml
+++ b/src/documentation/xdocs/todo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!DOCTYPE todo PUBLIC "-//APACHE//DTD Todo V1.1//EN" "dtd/todo-v11.dtd">
+<!DOCTYPE todo PUBLIC "-//APACHE//DTD Todo V1.1//EN" "./dtd/todo-v11.dtd">
 
 <todo title="Things To Do for Poi">
 
diff --git a/src/documentation/xdocs/who.xml b/src/documentation/xdocs/who.xml
index caa1cc240..202a23d9f 100644
--- a/src/documentation/xdocs/who.xml
+++ b/src/documentation/xdocs/who.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "document-v11.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN" "./dtd/document-v11.dtd">
 
 <document>
  <header>