diff --git a/docs/conf/extra/httpd-manual.conf.in b/docs/conf/extra/httpd-manual.conf.in
index d20a93f086..e210c9643d 100644
--- a/docs/conf/extra/httpd-manual.conf.in
+++ b/docs/conf/extra/httpd-manual.conf.in
@@ -2,7 +2,7 @@
 # Provide access to the documentation on your server as
 #  http://yourserver.example.com/manual/
 # The documentation is always available at
-#  http://httpd.apache.org/docs-2.1/
+#  http://httpd.apache.org/docs/2.2/
 #
 # Required modules: mod_alias, mod_setenvif, mod_negotiation
 #
diff --git a/docs/conf/extra/httpd-ssl.conf.in b/docs/conf/extra/httpd-ssl.conf.in
index 9ce660e907..e28c398d95 100644
--- a/docs/conf/extra/httpd-ssl.conf.in
+++ b/docs/conf/extra/httpd-ssl.conf.in
@@ -2,7 +2,7 @@
 # This is the Apache server configuration file providing SSL support.
 # It contains the configuration directives to instruct the server how to
 # serve pages over an https connection. For detailing information about these 
-# directives see <URL:http://httpd.apache.org/docs-2.1/mod/mod_ssl.html>
+# directives see <URL:http://httpd.apache.org/docs/2.2/mod/mod_ssl.html>
 # 
 # Do NOT simply read the instructions in here without understanding
 # what they do.  They're here only as hints or reminders.  If you are unsure
diff --git a/docs/conf/extra/httpd-vhosts.conf.in b/docs/conf/extra/httpd-vhosts.conf.in
index bd59a127d7..31895f755d 100644
--- a/docs/conf/extra/httpd-vhosts.conf.in
+++ b/docs/conf/extra/httpd-vhosts.conf.in
@@ -7,7 +7,7 @@
 # IP addresses. This is indicated by the asterisks in the directives below.
 #
 # Please see the documentation at 
-# <URL:http://httpd.apache.org/docs-2.1/vhosts/>
+# <URL:http://httpd.apache.org/docs/2.2/vhosts/>
 # for further details before you try to setup virtual hosts.
 #
 # You may use the command line option '-S' to verify your virtual host
diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index e8f2aab46a..4eeccb932b 100644
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -1,9 +1,9 @@
 #
 # This is the main Apache HTTP server configuration file.  It contains the
 # configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs-2.1/> for detailed information.
+# See <URL:http://httpd.apache.org/docs/2.2/> for detailed information.
 # In particular, see 
-# <URL:http://httpd.apache.org/docs-2.1/mod/directives.html>
+# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
 # for a discussion of each configuration directive.
 #
 # Do NOT simply read the instructions in here without understanding
@@ -183,7 +183,7 @@ DocumentRoot "@@ServerRoot@@/htdocs"
     # doesn't give it to you.
     #
     # The Options directive is both complicated and important.  Please see
-    # http://httpd.apache.org/docs-2.1/mod/core.html#options
+    # http://httpd.apache.org/docs/2.2/mod/core.html#options
     # for more information.
     #
     Options Indexes FollowSymLinks
diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in
index 960bfaa6f4..a163c70a9b 100644
--- a/docs/conf/httpd.conf.in
+++ b/docs/conf/httpd.conf.in
@@ -1,9 +1,9 @@
 #
 # This is the main Apache HTTP server configuration file.  It contains the
 # configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs-2.1/> for detailed information.
+# See <URL:http://httpd.apache.org/docs/2.2> for detailed information.
 # In particular, see 
-# <URL:http://httpd.apache.org/docs-2.1/mod/directives.html>
+# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
 # for a discussion of each configuration directive.
 #
 # Do NOT simply read the instructions in here without understanding
@@ -138,7 +138,7 @@ DocumentRoot "@exp_htdocsdir@"
     # doesn't give it to you.
     #
     # The Options directive is both complicated and important.  Please see
-    # http://httpd.apache.org/docs-2.1/mod/core.html#options
+    # http://httpd.apache.org/docs/2.2/mod/core.html#options
     # for more information.
     #
     Options Indexes FollowSymLinks
diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml
index e8e4d092d5..82699073d0 100644
--- a/docs/manual/upgrading.xml
+++ b/docs/manual/upgrading.xml
@@ -34,7 +34,7 @@
 
   <p>This document describes only the changes from 2.0 to 2.2.  If you
   are upgrading from version 1.3, you should also consult the <a
-  href="http://httpd.apache.org/docs-2.0/upgrading.html">1.3 to 2.0
+  href="http://httpd.apache.org/docs/2.0/upgrading.html">1.3 to 2.0
   upgrading document.</a></p>
 
 </summary>