diff --git a/src/reference/docbook/aop-api.xml b/src/reference/docbook/aop-api.xml
index 210079f0324..672422d4671 100644
--- a/src/reference/docbook/aop-api.xml
+++ b/src/reference/docbook/aop-api.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="aop-api">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="aop-api">
   <title>Spring AOP APIs</title>
 
   <section id="aop-api-introduction">
diff --git a/src/reference/docbook/aop.xml b/src/reference/docbook/aop.xml
index 8cddb122de8..b1da39ef5c5 100644
--- a/src/reference/docbook/aop.xml
+++ b/src/reference/docbook/aop.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<chapter id="aop">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="aop">
   <title>Aspect Oriented Programming with Spring</title>
 
   <section id="aop-introduction">
diff --git a/src/reference/docbook/beans-annotation-config.xml b/src/reference/docbook/beans-annotation-config.xml
index c8e5229725e..47b7d728cf1 100644
--- a/src/reference/docbook/beans-annotation-config.xml
+++ b/src/reference/docbook/beans-annotation-config.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<section id="beans-annotation-config">
+<section xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="beans-annotation-config">
   <title>Annotation-based container configuration</title>
 
   <sidebar>
diff --git a/src/reference/docbook/beans-classpath-scanning.xml b/src/reference/docbook/beans-classpath-scanning.xml
index ed5d472cb45..b16d9ac5860 100644
--- a/src/reference/docbook/beans-classpath-scanning.xml
+++ b/src/reference/docbook/beans-classpath-scanning.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<section id="beans-classpath-scanning">
+<section xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="beans-classpath-scanning">
   <title>Classpath scanning and managed components</title>
 
   <para>Most examples in this chapter use XML to specify the configuration
diff --git a/src/reference/docbook/beans-context-additional.xml b/src/reference/docbook/beans-context-additional.xml
index 326e9abcff2..52ed2593856 100644
--- a/src/reference/docbook/beans-context-additional.xml
+++ b/src/reference/docbook/beans-context-additional.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<section id="context-introduction">
+<section xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="context-introduction">
   <title>Additional Capabilities of the
     <interfacename>ApplicationContext</interfacename></title>
 
diff --git a/src/reference/docbook/beans-customizing.xml b/src/reference/docbook/beans-customizing.xml
index c9b8db67b83..bbf75350a2b 100644
--- a/src/reference/docbook/beans-customizing.xml
+++ b/src/reference/docbook/beans-customizing.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<section id="beans-factory-nature">
+<section xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="beans-factory-nature">
   <title>Customizing the nature of a bean</title>
 
   <section id="beans-factory-lifecycle">
diff --git a/src/reference/docbook/beans-dependencies.xml b/src/reference/docbook/beans-dependencies.xml
index c29484c152f..425ec366eb5 100644
--- a/src/reference/docbook/beans-dependencies.xml
+++ b/src/reference/docbook/beans-dependencies.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<section id="beans-dependencies">
+<section xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="beans-dependencies">
   <title>Dependencies</title>
 
   <para>A typical enterprise application does not consist of a single object (or
diff --git a/src/reference/docbook/beans-extension-points.xml b/src/reference/docbook/beans-extension-points.xml
index ece0f137283..b5e19641274 100644
--- a/src/reference/docbook/beans-extension-points.xml
+++ b/src/reference/docbook/beans-extension-points.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<section id="beans-factory-extension">
+<section xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="beans-factory-extension">
   <title>Container Extension Points</title>
 
   <para>Typically, an application developer does not need to subclass
diff --git a/src/reference/docbook/beans-java.xml b/src/reference/docbook/beans-java.xml
index 06725b7801b..72932da1d95 100644
--- a/src/reference/docbook/beans-java.xml
+++ b/src/reference/docbook/beans-java.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<section id="beans-java">
+<section xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="beans-java">
   <title>Java-based container configuration</title>
 
   <section id="beans-java-basic-concepts">
diff --git a/src/reference/docbook/beans-scopes.xml b/src/reference/docbook/beans-scopes.xml
index 99d2a8d21b5..677e6e2bd91 100644
--- a/src/reference/docbook/beans-scopes.xml
+++ b/src/reference/docbook/beans-scopes.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<section id="beans-factory-scopes">
+<section xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="beans-factory-scopes">
   <title>Bean scopes</title>
 
   <para>When you create a bean definition, you create a
diff --git a/src/reference/docbook/beans-standard-annotations.xml b/src/reference/docbook/beans-standard-annotations.xml
index 710d04aad59..3f5d82bd5ff 100644
--- a/src/reference/docbook/beans-standard-annotations.xml
+++ b/src/reference/docbook/beans-standard-annotations.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<section id="beans-standard-annotations">
+<section xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="beans-standard-annotations">
   <title>Using JSR 330 Standard Annotations</title>
   
   <para>Starting with Spring 3.0, Spring offers support for JSR-330 standard annotations (Dependency Injection).
@@ -197,4 +198,4 @@ component-scanning in the exact same way as when using Spring annotations:
 	
 	</section>
 
-</section>
\ No newline at end of file
+</section>
diff --git a/src/reference/docbook/beans.xml b/src/reference/docbook/beans.xml
index b9e0a6120c8..634d0b49321 100644
--- a/src/reference/docbook/beans.xml
+++ b/src/reference/docbook/beans.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="beans">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="beans">
   <title>The IoC container</title>
 
   <section id="beans-introduction">
diff --git a/src/reference/docbook/cache.xml b/src/reference/docbook/cache.xml
index e48b750c878..8ef5ebd2c56 100644
--- a/src/reference/docbook/cache.xml
+++ b/src/reference/docbook/cache.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<chapter id="cache">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="cache">
 	<title>Cache Abstraction</title>
 
 	<section id="cache-introduction">
diff --git a/src/reference/docbook/cci.xml b/src/reference/docbook/cci.xml
index 59e5cdce660..0597c48734c 100644
--- a/src/reference/docbook/cci.xml
+++ b/src/reference/docbook/cci.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="cci">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="cci">
   <title>JCA CCI</title>
 
   <section id="cci-introduction">
diff --git a/src/reference/docbook/classic-aop-spring.xml b/src/reference/docbook/classic-aop-spring.xml
index eaf0b73d088..f770d464d73 100644
--- a/src/reference/docbook/classic-aop-spring.xml
+++ b/src/reference/docbook/classic-aop-spring.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<appendix id="classic-aop-spring">
+<appendix xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="classic-aop-spring">
   <title>Classic Spring AOP Usage</title>
 
   <para>In this appendix we discuss 
diff --git a/src/reference/docbook/classic-spring.xml b/src/reference/docbook/classic-spring.xml
index f82b02df74b..b412a7f43b9 100644
--- a/src/reference/docbook/classic-spring.xml
+++ b/src/reference/docbook/classic-spring.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<appendix id="classic-spring">
+<appendix xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="classic-spring">
   <title>Classic Spring Usage</title>
 
   <para>This appendix discusses some classic Spring usage patterns as a
diff --git a/src/reference/docbook/dao.xml b/src/reference/docbook/dao.xml
index 7a20be23637..8526791ac54 100644
--- a/src/reference/docbook/dao.xml
+++ b/src/reference/docbook/dao.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="dao">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="dao">
   <title>DAO support</title>
 
   <section id="dao-introduction">
diff --git a/src/reference/docbook/dtd.xml b/src/reference/docbook/dtd.xml
index 82ef2c8346e..9976d4f8e5a 100644
--- a/src/reference/docbook/dtd.xml
+++ b/src/reference/docbook/dtd.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<appendix id="springbeansdtd">
+<appendix xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="springbeansdtd">
   <title><literal>spring-beans-2.0.dtd</literal></title>
 
   <para><programlisting language="xml">&lt;!--
diff --git a/src/reference/docbook/dynamic-languages.xml b/src/reference/docbook/dynamic-languages.xml
index da99b1bf369..4ad5b0c414d 100644
--- a/src/reference/docbook/dynamic-languages.xml
+++ b/src/reference/docbook/dynamic-languages.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<chapter id="dynamic-language">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="dynamic-language">
   <title>Dynamic language support</title>
 
   <section id="dynamic-language-introduction">
diff --git a/src/reference/docbook/ejb.xml b/src/reference/docbook/ejb.xml
index 3b765414c3c..cec60c21232 100644
--- a/src/reference/docbook/ejb.xml
+++ b/src/reference/docbook/ejb.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<chapter id="ejb">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="ejb">
 	<title>Enterprise JavaBeans (EJB) integration</title>
 
 	<section id="ejb-introduction">
diff --git a/src/reference/docbook/expressions.xml b/src/reference/docbook/expressions.xml
index ce8a489a696..a1df39b5704 100644
--- a/src/reference/docbook/expressions.xml
+++ b/src/reference/docbook/expressions.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="expressions">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="expressions">
   <title>Spring Expression Language (SpEL)</title>
 
   <section id="expressions-intro">
diff --git a/src/reference/docbook/index.xml b/src/reference/docbook/index.xml
index 09687c799d3..dfefdc3810f 100644
--- a/src/reference/docbook/index.xml
+++ b/src/reference/docbook/index.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<book>
+<book xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xml:id="spring-framework-reference"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xmlns:xlink="http://www.w3.org/1999/xlink">
   <bookinfo>
     <title>Reference Documentation</title>
 
diff --git a/src/reference/docbook/jdbc.xml b/src/reference/docbook/jdbc.xml
index f5ff5d2b324..a81fd14ffa9 100644
--- a/src/reference/docbook/jdbc.xml
+++ b/src/reference/docbook/jdbc.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="jdbc">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="jdbc">
   <title>Data access with JDBC</title>
 
   <section id="jdbc-introduction">
diff --git a/src/reference/docbook/jms.xml b/src/reference/docbook/jms.xml
index 320c8d89882..4d5ae50b6d6 100644
--- a/src/reference/docbook/jms.xml
+++ b/src/reference/docbook/jms.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="jms">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="jms">
   <title>JMS (Java Message Service)</title>
 
   <section id="jms-introduction">
diff --git a/src/reference/docbook/jmx.xml b/src/reference/docbook/jmx.xml
index 6411f24e875..6f9707dc4bf 100644
--- a/src/reference/docbook/jmx.xml
+++ b/src/reference/docbook/jmx.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<chapter id="jmx">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="jmx">
   <title>JMX</title>
 
   <section id="jmx-introduction">
diff --git a/src/reference/docbook/mail.xml b/src/reference/docbook/mail.xml
index 63caf0695f6..cb28b3b2bb2 100644
--- a/src/reference/docbook/mail.xml
+++ b/src/reference/docbook/mail.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<chapter id="mail">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="mail">
   <title>Email</title>
 
   <section id="mail-introduction">
diff --git a/src/reference/docbook/mvc.xml b/src/reference/docbook/mvc.xml
index 4534c43da2a..b26c0808852 100644
--- a/src/reference/docbook/mvc.xml
+++ b/src/reference/docbook/mvc.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="mvc">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="mvc">
   <title>Web MVC framework</title>
 
   <section id="mvc-introduction">
diff --git a/src/reference/docbook/new-in-3.0.xml b/src/reference/docbook/new-in-3.0.xml
index 555cba6ac40..3b5c8ec50b1 100644
--- a/src/reference/docbook/new-in-3.0.xml
+++ b/src/reference/docbook/new-in-3.0.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="new-in-3.0">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="new-in-3.0">
   <title>New Features and Enhancements in Spring 3.0</title>
 
   <para>If you have been using the Spring Framework for some time, you will be
diff --git a/src/reference/docbook/new-in-3.1.xml b/src/reference/docbook/new-in-3.1.xml
index 7947120bdf1..27c9024b074 100644
--- a/src/reference/docbook/new-in-3.1.xml
+++ b/src/reference/docbook/new-in-3.1.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="new-in-3.1">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="new-in-3.1">
   <title>New Features and Enhancements in Spring 3.1</title>
 
   <para>Building on the support introduced in Spring 3.0, Spring 3.1 is
diff --git a/src/reference/docbook/orm.xml b/src/reference/docbook/orm.xml
index f64a463ede4..252d63a9961 100644
--- a/src/reference/docbook/orm.xml
+++ b/src/reference/docbook/orm.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="orm">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="orm">
   <title>Object Relational Mapping (ORM) Data Access</title>
 
   <section id="orm-introduction">
diff --git a/src/reference/docbook/overview.xml b/src/reference/docbook/overview.xml
index e15e4bad534..41a980aec9e 100644
--- a/src/reference/docbook/overview.xml
+++ b/src/reference/docbook/overview.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="overview">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="overview">
   <title>Introduction to Spring Framework</title>
 
   <para>Spring Framework is a Java platform that provides comprehensive
diff --git a/src/reference/docbook/oxm.xml b/src/reference/docbook/oxm.xml
index 9a4694dbb95..cf1c9a329bb 100644
--- a/src/reference/docbook/oxm.xml
+++ b/src/reference/docbook/oxm.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<chapter id="oxm">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="oxm">
     <title>Marshalling XML using O/X Mappers</title>
 
     <section id="oxm-introduction">
diff --git a/src/reference/docbook/portlet.xml b/src/reference/docbook/portlet.xml
index ec4ac3fcc79..5a71478ee4c 100644
--- a/src/reference/docbook/portlet.xml
+++ b/src/reference/docbook/portlet.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<chapter id="portlet" xmlns:xi="http://www.w3.org/2001/XInclude">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="portlet">
   <title>Portlet MVC Framework</title>
 
   <section id="portlet-introduction">
diff --git a/src/reference/docbook/preface.xml b/src/reference/docbook/preface.xml
index 67c346981be..4913cb1a280 100644
--- a/src/reference/docbook/preface.xml
+++ b/src/reference/docbook/preface.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<preface id="preface">
+<preface xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="preface">
   <title>Preface</title>
 
   <para>Developing software applications is hard enough even with good tools
@@ -36,4 +36,4 @@
   have any requests or comments, please post them on the user mailing list or
   on the support forums at <ulink url="http://forum.springsource.org/" />.
   </para>
-</preface>
\ No newline at end of file
+</preface>
diff --git a/src/reference/docbook/remoting.xml b/src/reference/docbook/remoting.xml
index d26c1b61540..fc81c0ab45c 100644
--- a/src/reference/docbook/remoting.xml
+++ b/src/reference/docbook/remoting.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="remoting">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="remoting">
   <title>Remoting and web services using Spring</title>
 
   <section id="remoting-introduction">
diff --git a/src/reference/docbook/resources.xml b/src/reference/docbook/resources.xml
index 97e5025160a..a25e74b93e7 100644
--- a/src/reference/docbook/resources.xml
+++ b/src/reference/docbook/resources.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<chapter id="resources">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="resources">
   <title>Resources</title>
 
   <section id="resources-introduction">
diff --git a/src/reference/docbook/scheduling.xml b/src/reference/docbook/scheduling.xml
index 6132a409cca..28aff0638b0 100644
--- a/src/reference/docbook/scheduling.xml
+++ b/src/reference/docbook/scheduling.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="scheduling">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="scheduling">
   <title>Task Execution and Scheduling</title>
 
   <section id="scheduling-introduction">
@@ -930,4 +931,4 @@ public class ExampleJob extends QuartzJobBean {
 &lt;/bean&gt;</programlisting>
     </section>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/src/reference/docbook/spring-form.tld.xml b/src/reference/docbook/spring-form.tld.xml
index 9da5029e986..93e94d2e630 100644
--- a/src/reference/docbook/spring-form.tld.xml
+++ b/src/reference/docbook/spring-form.tld.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<appendix id="spring-form.tld">
+<appendix xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="spring-form.tld">
    <title>spring-form.tld</title>
    <section id="spring-form.tld-intro">
       <title>Introduction</title>
diff --git a/src/reference/docbook/spring.tld.xml b/src/reference/docbook/spring.tld.xml
index 52c59c40565..9e480fb9371 100644
--- a/src/reference/docbook/spring.tld.xml
+++ b/src/reference/docbook/spring.tld.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<appendix id="spring.tld">
+<appendix xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="spring.tld">
    <title>spring.tld</title>
    <section id="spring.tld-intro">
       <title>Introduction</title>
diff --git a/src/reference/docbook/swf-sidebar.xml b/src/reference/docbook/swf-sidebar.xml
index 39ed89d90be..cdd9c6e8928 100644
--- a/src/reference/docbook/swf-sidebar.xml
+++ b/src/reference/docbook/swf-sidebar.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sidebar PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<sidebar>
+<sidebar xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="spring-web-flow-sidebar">
   <title>Spring Web Flow</title>
 
   <para>Spring Web Flow (SWF) aims to be the best solution for the management
@@ -21,4 +21,4 @@
   <para>For more information about SWF, consult the
   <ulink url="http://www.springframework.org/webflow">Spring Web Flow website</ulink>.
   </para>
-</sidebar>
\ No newline at end of file
+</sidebar>
diff --git a/src/reference/docbook/testing.xml b/src/reference/docbook/testing.xml
index 9dbe84d626e..40464947cc5 100644
--- a/src/reference/docbook/testing.xml
+++ b/src/reference/docbook/testing.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="testing">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="testing">
   <title>Testing</title>
 
   <section id="testing-introduction">
diff --git a/src/reference/docbook/transaction.xml b/src/reference/docbook/transaction.xml
index e7db8907a74..349bfed4617 100644
--- a/src/reference/docbook/transaction.xml
+++ b/src/reference/docbook/transaction.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="transaction">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="transaction">
   <title>Transaction Management</title>
 
   <section id="transaction-intro">
diff --git a/src/reference/docbook/validation.xml b/src/reference/docbook/validation.xml
index 08d6d02959d..9a619bce204 100644
--- a/src/reference/docbook/validation.xml
+++ b/src/reference/docbook/validation.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<chapter id="validation">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="validation">
   <title>Validation, Data Binding, and Type Conversion</title>
 
   <section id="validation-introduction">
diff --git a/src/reference/docbook/view.xml b/src/reference/docbook/view.xml
index b9e27ed603f..27af1dbc6c8 100644
--- a/src/reference/docbook/view.xml
+++ b/src/reference/docbook/view.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="view">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="view">
   <title>View technologies</title>
 
   <section id="view-introduction">
diff --git a/src/reference/docbook/web-integration.xml b/src/reference/docbook/web-integration.xml
index e141362af61..583f19295eb 100644
--- a/src/reference/docbook/web-integration.xml
+++ b/src/reference/docbook/web-integration.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="web-integration">
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="web-integration">
   <title>Integrating with other web frameworks</title>
 
   <section id="intro">
diff --git a/src/reference/docbook/xml-custom.xml b/src/reference/docbook/xml-custom.xml
index 46ae1ea2096..3d2c36f200d 100644
--- a/src/reference/docbook/xml-custom.xml
+++ b/src/reference/docbook/xml-custom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<appendix id="extensible-xml">
+<appendix xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="extensible-xml">
     <title>Extensible XML authoring</title>
     <section id="extensible-xml-introduction">
         <title>Introduction</title>
diff --git a/src/reference/docbook/xsd-configuration.xml b/src/reference/docbook/xsd-configuration.xml
index 9e66092ff36..576da4c31d1 100644
--- a/src/reference/docbook/xsd-configuration.xml
+++ b/src/reference/docbook/xsd-configuration.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-
-<appendix id="xsd-config">
+<appendix xmlns="http://docbook.org/ns/docbook" version="5.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:xi="http://www.w3.org/2001/XInclude"
+    xml:id="xsd-config">
     <title>XML Schema-based configuration</title>
     <section id="xsd-config-introduction">
         <title>Introduction</title>