diff --git a/jetty-test-webapp/src/main/config/contexts/demo.xml b/jetty-test-webapp/src/main/config/contexts/demo.xml
index af8dc18ff07..8c3cf5088b1 100644
--- a/jetty-test-webapp/src/main/config/contexts/demo.xml
+++ b/jetty-test-webapp/src/main/config/contexts/demo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"  encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.eclipse.org/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
 
 <Configure class="org.eclipse.jetty.server.handler.MovedContextHandler">
   <Set name="contextPath">/demo</Set>
diff --git a/jetty-test-webapp/src/main/config/contexts/test.xml b/jetty-test-webapp/src/main/config/contexts/test.xml
index f22579f3826..c6143fceabc 100644
--- a/jetty-test-webapp/src/main/config/contexts/test.xml
+++ b/jetty-test-webapp/src/main/config/contexts/test.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"  encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.eclipse.org/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
 
 <!-- ==================================================================
 Configure and deploy the test web application in $(jetty.home)/webapps/test
diff --git a/jetty-test-webapp/src/main/webapp/WEB-INF/jetty-web.xml b/jetty-test-webapp/src/main/webapp/WEB-INF/jetty-web.xml
index b0e838f07db..89dd6a73239 100644
--- a/jetty-test-webapp/src/main/webapp/WEB-INF/jetty-web.xml
+++ b/jetty-test-webapp/src/main/webapp/WEB-INF/jetty-web.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"  encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.eclipse.org/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
 
 <!--
 This is the jetty specific web application configuration file.  When starting
diff --git a/jetty-test-webapp/src/main/webapp/index.html b/jetty-test-webapp/src/main/webapp/index.html
index e39e7cc36fb..52ed95b9854 100644
--- a/jetty-test-webapp/src/main/webapp/index.html
+++ b/jetty-test-webapp/src/main/webapp/index.html
@@ -34,6 +34,7 @@ This is a test context that serves:
 </ul>
 </p>
 
+
 <p>
 Other demonstration contexts, some of which may need manual deployment
 (check the README.txt file for details): 
diff --git a/jetty-util/src/main/config/etc/jetty-logging.xml b/jetty-util/src/main/config/etc/jetty-logging.xml
index f264bba73bb..4569d70c26b 100644
--- a/jetty-util/src/main/config/etc/jetty-logging.xml
+++ b/jetty-util/src/main/config/etc/jetty-logging.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.eclipse.org/configure.dtd">
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
 
 
 <!-- =============================================================== -->