diff --git a/doc/common-rst/app_support.rst b/doc/common-rst/app_support.rst
index f946271bcf..c6df3e2e78 100644
--- a/doc/common-rst/app_support.rst
+++ b/doc/common-rst/app_support.rst
@@ -61,8 +61,7 @@ The following books explain how to configure and run an OpenStack cloud:
 The following books explain how to use the OpenStack dashboard and
 command-line clients:
 
--  `API Quick
-   Start <http://docs.openstack.org/api/quick-start/content/>`__
+-  `API Guide <http://developer.openstack.org/api-guide/quick-start/>`__
 
 -  `End User Guide <http://docs.openstack.org/user-guide/>`__
 
diff --git a/doc/common/app_support.xml b/doc/common/app_support.xml
index 6d50ff2e0c..88fb0b9abf 100644
--- a/doc/common/app_support.xml
+++ b/doc/common/app_support.xml
@@ -112,9 +112,9 @@
             <listitem>
                 <para>
                     <link
-                        xlink:href="http://docs.openstack.org/api/quick-start/content/"
-                            ><citetitle>API Quick
-                        Start</citetitle></link></para>
+                        xlink:href="http://developer.openstack.org/api-guide/quick-start/"
+                            ><citetitle>API
+                        Guide</citetitle></link></para>
             </listitem>
             <listitem>
                 <para>
diff --git a/doc/contributor-guide/source/content-specs.rst b/doc/contributor-guide/source/content-specs.rst
index 6b910ed9da..43879dba9d 100644
--- a/doc/contributor-guide/source/content-specs.rst
+++ b/doc/contributor-guide/source/content-specs.rst
@@ -71,7 +71,7 @@ Guides for end users
 * `OpenStack Admin User Guide`_: Shows OpenStack administrators how to create
   and manage resources in an OpenStack cloud with the OpenStack dashboard and
   OpenStack client commands.
-* `OpenStack API Quick Start`_: A brief overview of how to send REST API
+* `OpenStack API Guide`_: A brief overview of how to send REST API
   requests to endpoints for OpenStack services.
 * `Command-Line Interface Reference`_: Automatically generates help text for
   CLI commands and subcommands.
@@ -167,7 +167,7 @@ This guide has a review in place to get a license indicator in output:
 
 .. _`OpenStack End User Guide`: http://docs.openstack.org/user-guide/index.html
 .. _`OpenStack Admin User Guide`: http://docs.openstack.org/user-guide-admin/index.html
-.. _`OpenStack API Quick Start`: http://docs.openstack.org/api/quick-start/content/
+.. _`OpenStack API Guide`: http://developer.openstack.org/api-guide/quick-start/
 .. _`Command-Line Interface Reference`: http://docs.openstack.org/cli-reference/content/
 
 .. _`Complete API Reference`: http://developer.openstack.org/api-ref.html
diff --git a/doc/contributor-guide/source/docs_builds.rst b/doc/contributor-guide/source/docs_builds.rst
index b218d85d0c..4400ad0e18 100644
--- a/doc/contributor-guide/source/docs_builds.rst
+++ b/doc/contributor-guide/source/docs_builds.rst
@@ -104,9 +104,9 @@ Guides for end users
      - Source location
      - Target location
 
-   * - API Quick Start
+   * - API Guide
      - http://git.openstack.org/cgit/openstack/api-site/tree/api-quick-start
-     - http://docs.openstack.org/api/quick-start/content
+     - http://developer.openstack.org/api-guide/quick-start/
 
    * - End User Guide
      - http://git.openstack.org/cgit/openstack/openstack-manuals/tree/doc/user-guide
diff --git a/www/static/.htaccess b/www/static/.htaccess
index 1c37d2c883..32e4612660 100644
--- a/www/static/.htaccess
+++ b/www/static/.htaccess
@@ -171,3 +171,6 @@ redirect 301 /hot-reference/content/ /developer/heat/template_guide/
 
 # Redirect nova/devref/
 redirectmatch 301 ^/developer/nova/devref/(.+)$ /developer/nova/$1
+
+# Redirect API Quick Start after migration to RST
+redirect 301 /api/quick-start/content/ http://developer.openstack.org/api-guide/quick-start/