diff --git a/doc/common-rst/app_support.rst b/doc/common-rst/app_support.rst
index 258c6f4963..1396776145 100644
--- a/doc/common-rst/app_support.rst
+++ b/doc/common-rst/app_support.rst
@@ -37,7 +37,7 @@ associated components:
 The following books explain how to configure and run an OpenStack cloud:
 
 -  `Architecture Design
-   Guide <http://docs.openstack.org/arch-design/content/>`__
+   Guide <http://docs.openstack.org/arch-design/>`__
 
 -  `Cloud Administrator
    Guide <http://docs.openstack.org/admin-guide-cloud/>`__
diff --git a/doc/common/app_support.xml b/doc/common/app_support.xml
index 2145aa8ce4..fb3f50bacd 100644
--- a/doc/common/app_support.xml
+++ b/doc/common/app_support.xml
@@ -57,7 +57,7 @@
         <itemizedlist>
             <listitem>
                 <para><link
-                        xlink:href="http://docs.openstack.org/arch-design/content/"
+                        xlink:href="http://docs.openstack.org/arch-design/"
                             ><citetitle>Architecture Design
                             Guide</citetitle></link></para>
             </listitem>
diff --git a/doc/contributor-guide/source/content-specs.rst b/doc/contributor-guide/source/content-specs.rst
index d0c1f2198c..8f42f9d54b 100644
--- a/doc/contributor-guide/source/content-specs.rst
+++ b/doc/contributor-guide/source/content-specs.rst
@@ -159,7 +159,7 @@ This guide has a review in place to get a license indicator in output:
 
 .. _`release information`: https://wiki.openstack.org/wiki/Releases
 
-.. _`OpenStack Architecture Design Guide`: http://docs.openstack.org/arch-design/content/
+.. _`OpenStack Architecture Design Guide`: http://docs.openstack.org/arch-design/
 .. _`OpenStack Cloud Administrator Guide`: http://docs.openstack.org/admin-guide-cloud/index.html
 .. _`OpenStack High Availability Guide`: http://docs.openstack.org/ha-guide/index.html
 .. _`OpenStack Security Guide`: http://docs.openstack.org/sec/
diff --git a/doc/contributor-guide/source/docs-builds.rst b/doc/contributor-guide/source/docs-builds.rst
index 507a113ba1..dad00079e2 100644
--- a/doc/contributor-guide/source/docs-builds.rst
+++ b/doc/contributor-guide/source/docs-builds.rst
@@ -68,7 +68,7 @@ Guides for deployers and administrators
 
    * - Architecture Design Guide
      - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/arch-design
-     - http://docs.openstack.org/arch-design/content
+     - http://docs.openstack.org/arch-design/
 
    * - Configuration Reference
      - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/config-reference
diff --git a/doc/install-guide/source/overview.rst b/doc/install-guide/source/overview.rst
index 05c8c6bf8d..d7a07932bf 100644
--- a/doc/install-guide/source/overview.rst
+++ b/doc/install-guide/source/overview.rst
@@ -122,7 +122,7 @@ follows:
   network instead of a dedicated network.
 
 For more information on production architectures, see the
-`Architecture Design Guide <http://docs.openstack.org/arch-design/content/>`__,
+`Architecture Design Guide <http://docs.openstack.org/arch-design/>`__,
 `Operations Guide <http://docs.openstack.org/ops/>`__, and
 `Networking Guide <http://docs.openstack.org/networking-guide/>`__.
 
diff --git a/www/arch/index.html b/www/arch/index.html
index 73692de996..6c8c3391c6 100644
--- a/www/arch/index.html
+++ b/www/arch/index.html
@@ -16,8 +16,7 @@ Authors who know how to design clouds that meet users' needs wrote this book in
 <hr />
                 <h3>Get the Book!</h3>
 
-   <a class="overview-btn docs-btn" href="http://docs.openstack.org/arch-design/content/" onclick="recordOutboundLink(this, 'Outbound Links', 'arch-guide.html');return false;">Current HTML<i class="fa fa-arrow-circle-o-down"></i></a>
-   <a class="overview-btn docs-btn" href="http://docs.openstack.org/arch-design/arch-design.pdf" onclick="recordOutboundLink(this, 'Outbound Links', arch-design.pdf');return false;"> Current PDF<i class="fa fa-arrow-circle-o-down"></i></a>
+   <a class="overview-btn docs-btn" href="http://docs.openstack.org/arch-design/" onclick="recordOutboundLink(this, 'Outbound Links', 'arch-guide.html');return false;">Current HTML<i class="fa fa-arrow-circle-o-down"></i></a>
    <a class="overview-btn docs-btn" href="http://www.lulu.com/shop/openstack-foundation/openstack-architecture-design-guide/paperback/product-21740250.html" onclick="recordOutboundLink(this, 'Outbound Links', 'archlulu.com');return false;"> buy it from Lulu<i class="fa fa-arrow-circle-o-right"></i></a>
 
        </div>
@@ -68,11 +67,7 @@ Authors who know how to design clouds that meet users' needs wrote this book in
    </li>
   </ul>
   <p>
-   You can get the
-   <a href="http://docs.openstack.org/arch-design/arch-design.pdf" onclick="recordOutboundLink(this, 'Outbound Links', arch-design.pdf');return false;">
-    PDF
-   </a>
-   to print yourself. If you'd like a bound copy,
+   If you'd like a bound copy,
    <a href="http://www.lulu.com/shop/openstack-foundation/openstack-architecture-design-guide/paperback/product-21740250.html" onclick="recordOutboundLink(this, 'Outbound Links', 'archlulu.com');return false;">
     buy it from Lulu
    </a>
diff --git a/www/templates/ops_and_admin_guides.tmpl b/www/templates/ops_and_admin_guides.tmpl
index 7398a93dc6..b3b5a7e51c 100644
--- a/www/templates/ops_and_admin_guides.tmpl
+++ b/www/templates/ops_and_admin_guides.tmpl
@@ -12,6 +12,6 @@
                     <p>Guidelines and scenarios for creating more secure OpenStack clouds</p>
                     <a href="/image-guide/content/">Virtual Machine Image Guide</a>
                     <p>Obtain, create, and modify OpenStack-compatible virtual machine images</p>
-                    <a href="/arch-design/content/">Architecture Design Guide</a>
+                    <a href="/arch-design/">Architecture Design Guide</a>
                     <p>Guidelines for designing an OpenStack cloud</p>
                 </div>