diff --git a/doc/common-rst/app_support.rst b/doc/common-rst/app_support.rst
index c60cf8fcc7..d52474616b 100644
--- a/doc/common-rst/app_support.rst
+++ b/doc/common-rst/app_support.rst
@@ -41,7 +41,7 @@ The following books explain how to configure and run an OpenStack cloud:
    Guide <http://docs.openstack.org/arch-design/content/>`__
 
 -  `Cloud Administrator
-   Guide <http://docs.openstack.org/admin-guide-cloud/content/>`__
+   Guide <http://docs.openstack.org/admin-guide-cloud/>`__
 
 -  `Configuration
    Reference <http://docs.openstack.org/juno/config-reference/content/>`__
diff --git a/doc/common/app_support.xml b/doc/common/app_support.xml
index 9b84a36b54..09a0ddb7bc 100644
--- a/doc/common/app_support.xml
+++ b/doc/common/app_support.xml
@@ -65,7 +65,7 @@
             <listitem>
                 <para>
                     <link
-                        xlink:href="http://docs.openstack.org/admin-guide-cloud/content/"
+                        xlink:href="http://docs.openstack.org/admin-guide-cloud/"
                             ><citetitle>Cloud Administrator
                             Guide</citetitle></link></para>
             </listitem>
diff --git a/doc/pom.xml b/doc/pom.xml
index 5652f31c42..d2a3ce3f45 100644
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -10,7 +10,6 @@
   <packaging>pom</packaging>
 
   <modules>
-    <module>admin-guide-cloud</module>
     <module>arch-design</module>
     <module>cli-reference</module>
     <module>config-reference</module>
diff --git a/www/havana/index.html b/www/havana/index.html
index 099f9208e3..3194049c02 100644
--- a/www/havana/index.html
+++ b/www/havana/index.html
@@ -87,7 +87,7 @@
                         <h3><i class="fa fa-wrench"></i> Configuration Guides</h3>
                         <a href="/arch-design/content/">Architecture Design Guide</a>
                         <a href="/havana/config-reference/content/">Configuration Reference</a>
-                        <a href="/admin-guide-cloud/content/">Cloud Administrator Guide</a>
+                        <a href="/admin-guide-cloud/">Cloud Administrator Guide</a>
                         <a href="/high-availability-guide/content/index.html">High Availability Guide</a>
                         <a href="/ops/">Operations Guide</a>
                         <a href="/security-guide/">Security Guide</a>
@@ -97,7 +97,7 @@
                 <div class="col-lg-6 col-md-6 col-sm-6">
                     <div class="docs-link-sections">
                         <h3><i class="fa fa-users"></i> Operations and Administration Guides</h3>
-                        <a href="/admin-guide-cloud/content/">Cloud Administrator Guide</a>
+                        <a href="/admin-guide-cloud/">Cloud Administrator Guide</a>
                         <a href="/high-availability-guide/content/">High Availability Guide</a>
                         <a href="/ops/">Operations Guide</a>
                         <a href="/security-guide/">Security Guide</a>
diff --git a/www/icehouse/index.html b/www/icehouse/index.html
index 0973f5867d..3951a2dba8 100644
--- a/www/icehouse/index.html
+++ b/www/icehouse/index.html
@@ -87,7 +87,7 @@
                         <h3><i class="fa fa-wrench"></i> Configuration Guides</h3>
                         <a href="/arch-design/content/">Architecture Design Guide</a>
                         <a href="/icehouse/config-reference/content/">Configuration Reference</a>
-                        <a href="/admin-guide-cloud/content/">Cloud Administrator Guide</a>
+                        <a href="/admin-guide-cloud/">Cloud Administrator Guide</a>
                         <a href="/high-availability-guide/content/index.html">High Availability Guide</a>
                         <a href="/ops/">Operations Guide</a>
                         <a href="/security-guide/">Security Guide</a>
@@ -97,7 +97,7 @@
                 <div class="col-lg-6 col-md-6 col-sm-6">
                     <div class="docs-link-sections">
                         <h3><i class="fa fa-users"></i> Operations and Administration Guides</h3>
-                        <a href="/admin-guide-cloud/content/">Cloud Administrator Guide</a>
+                        <a href="/admin-guide-cloud/">Cloud Administrator Guide</a>
                         <a href="/high-availability-guide/content/">High Availability Guide</a>
                         <a href="/ops/">Operations Guide</a>
                         <a href="/security-guide/">Security Guide</a>
diff --git a/www/index.html b/www/index.html
index df7e1b7d1e..de1b6d709b 100644
--- a/www/index.html
+++ b/www/index.html
@@ -95,7 +95,7 @@
                         <h3 id="configuration-guides"><i class="fa fa-wrench"></i> Configuration Guides</h3>
                         <a href="/arch-design/content/">Architecture Design Guide</a>
                         <a href="/kilo/config-reference/content/">Configuration Reference</a>
-                        <a href="/admin-guide-cloud/content/">Cloud Administrator Guide</a>
+                        <a href="/admin-guide-cloud/">Cloud Administrator Guide</a>
                         <a href="/high-availability-guide/content/index.html">High Availability Guide</a>
                         <a href="/ops/">Operations Guide</a>
                         <a href="/security-guide/">Security Guide</a>
@@ -105,7 +105,7 @@
                 <div class="col-lg-6 col-md-6 col-sm-6">
                     <div class="docs-link-sections">
                         <h3 id="ops-and-admin-guides"><i class="fa fa-users"></i> Operations and Administration Guides</h3>
-                        <a href="/admin-guide-cloud/content/">Cloud Administrator Guide</a>
+                        <a href="/admin-guide-cloud/">Cloud Administrator Guide</a>
                         <a href="/high-availability-guide/content/">High Availability Guide</a>
                         <a href="/networking-guide/">Networking Guide</a>
                         <a href="/ops/">Operations Guide</a>
diff --git a/www/juno/index.html b/www/juno/index.html
index fe180da083..a1e82428fd 100644
--- a/www/juno/index.html
+++ b/www/juno/index.html
@@ -93,7 +93,7 @@
                         <h3><i class="fa fa-wrench"></i> Configuration Guides</h3>
                         <a href="/arch-design/content/">Architecture Design Guide</a>
                         <a href="/juno/config-reference/content/">Configuration Reference</a>
-                        <a href="/admin-guide-cloud/content/">Cloud Administrator Guide</a>
+                        <a href="/admin-guide-cloud/">Cloud Administrator Guide</a>
                         <a href="/high-availability-guide/content/index.html">High Availability Guide</a>
                         <a href="/ops/">Operations Guide</a>
                         <a href="/security-guide/">Security Guide</a>
@@ -103,7 +103,7 @@
                 <div class="col-lg-6 col-md-6 col-sm-6">
                     <div class="docs-link-sections">
                         <h3><i class="fa fa-users"></i> Operations and Administration Guides</h3>
-                        <a href="/admin-guide-cloud/content/">Cloud Administrator Guide</a>
+                        <a href="/admin-guide-cloud/">Cloud Administrator Guide</a>
                         <a href="/high-availability-guide/content/">High Availability Guide</a>
                         <a href="/ops/">Operations Guide</a>
                         <a href="/networking-guide/">Networking Guide</a>
diff --git a/www/kilo/index.html b/www/kilo/index.html
index 3cda701ce1..5b55a9af14 100644
--- a/www/kilo/index.html
+++ b/www/kilo/index.html
@@ -93,7 +93,7 @@
                         <h3><i class="fa fa-wrench"></i> Configuration Guides</h3>
                         <a href="/arch-design/content/">Architecture Design Guide</a>
                         <a href="/kilo/config-reference/content/">Configuration Reference</a>
-                        <a href="/admin-guide-cloud/content/">Cloud Administrator Guide</a>
+                        <a href="/admin-guide-cloud/">Cloud Administrator Guide</a>
                         <a href="/high-availability-guide/content/index.html">High Availability Guide</a>
                         <a href="/ops/">Operations Guide</a>
                         <a href="/security-guide/">Security Guide</a>
@@ -103,7 +103,7 @@
                 <div class="col-lg-6 col-md-6 col-sm-6">
                     <div class="docs-link-sections">
                         <h3><i class="fa fa-users"></i> Operations and Administration Guides</h3>
-                        <a href="/admin-guide-cloud/content/">Cloud Administrator Guide</a>
+                        <a href="/admin-guide-cloud/">Cloud Administrator Guide</a>
                         <a href="/high-availability-guide/content/">High Availability Guide</a>
                         <a href="/ops/">Operations Guide</a>
                         <a href="/networking-guide/">Networking Guide</a>
diff --git a/www/static/.htaccess b/www/static/.htaccess
index 36257a4865..55358ffac1 100644
--- a/www/static/.htaccess
+++ b/www/static/.htaccess
@@ -140,6 +140,7 @@ redirect 301 /user-guide-admin/content/nova_cli_migrate_single.html /user-guide-
 
 redirectmatch 301 "^/user-guide/content/.*$" /user-guide/index.html
 redirectmatch 301 "^/user-guide-admin/content/.*" /user-guide-admin/index.html
+redirectmatch 301 "^/admin-guide-cloud/content/.*$" /admin-guide-cloud/index.html
 
 # Hot-guide has moved to heat repo
 redirect 301 /user-guide/hot-guide/hot.html /developer/heat/template_guide/hot_guide.html