diff --git a/doc/source/advanced-topics/federation/configure_federation.rst b/doc/source/advanced-topics/federation/configure_federation.rst
index 8e03827351..d44851cbf4 100644
--- a/doc/source/advanced-topics/federation/configure_federation.rst
+++ b/doc/source/advanced-topics/federation/configure_federation.rst
@@ -51,11 +51,14 @@ Ubuntu 14.04 and Apache 2.4.7.
 
 To enable federation, you'll need to:
 
-1. `Run keystone under Apache`_, rather than using uwsgi command.
+1. Run keystone under Apache for `SUSE`_, `RedHat`_ or `Ubuntu`_, rather than
+   using uwsgi command.
 2. `Configure Apache to use a federation capable authentication method`_.
 3. `Configure Federation in Keystone`_.
 
-.. _`Run keystone under Apache`: ../apache-httpd.html
+.. _`SUSE`: ../../install/keystone-install-obs.html#configure-the-apache-http-server
+.. _`RedHat`: ../../install/keystone-install-rdo.html#configure-the-apache-http-server
+.. _`Ubuntu`: ../../install/keystone-install-ubuntu.html#configure-the-apache-http-server
 
 Configure Apache to use a federation capable authentication method
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/source/advanced-topics/federation/mellon.rst b/doc/source/advanced-topics/federation/mellon.rst
index cb6e056620..78dfc65677 100644
--- a/doc/source/advanced-topics/federation/mellon.rst
+++ b/doc/source/advanced-topics/federation/mellon.rst
@@ -20,9 +20,12 @@ Setup Mellon
 Configure Apache HTTPD for mod_auth_mellon
 ------------------------------------------
 
-Follow the steps outlined at: `Running Keystone in HTTPD`_.
+Follow the steps outlined at: Keystone install guide for `SUSE`_, `RedHat`_ or
+`Ubuntu`_.
 
-.. _`Running Keystone in HTTPD`: ../apache-httpd.html
+.. _`SUSE`: ../../install/keystone-install-obs.html#configure-the-apache-http-server
+.. _`RedHat`: ../../install/keystone-install-rdo.html#configure-the-apache-http-server
+.. _`Ubuntu`: ../../install/keystone-install-ubuntu.html#configure-the-apache-http-server
 
 You'll also need to install the Apache module `mod_auth_mellon
 <https://github.com/UNINETT/mod_auth_mellon>`_.  For example:
diff --git a/doc/source/advanced-topics/federation/shibboleth.rst b/doc/source/advanced-topics/federation/shibboleth.rst
index 8e6e73e553..644b5fb8be 100644
--- a/doc/source/advanced-topics/federation/shibboleth.rst
+++ b/doc/source/advanced-topics/federation/shibboleth.rst
@@ -20,9 +20,12 @@ Setup Shibboleth
 Configure Apache HTTPD for mod_shibboleth
 -----------------------------------------
 
-Follow the steps outlined at: `Running Keystone in HTTPD`_.
+Follow the steps outlined at: Running Keystone in HTTPD for `SUSE`_, `RedHat`_
+or `Ubuntu`_.
 
-.. _`Running Keystone in HTTPD`: ../apache-httpd.html
+.. _`SUSE`: ../../install/keystone-install-obs.html#configure-the-apache-http-server
+.. _`RedHat`: ../../install/keystone-install-rdo.html#configure-the-apache-http-server
+.. _`Ubuntu`: ../../install/keystone-install-ubuntu.html#configure-the-apache-http-server
 
 You'll also need to install `Shibboleth <https://wiki.shibboleth.net/confluence/display/SHIB2/Home>`_, for
 example:
diff --git a/httpd/README b/httpd/README
index 35a32fc06d..14d423deec 100644
--- a/httpd/README
+++ b/httpd/README
@@ -1,2 +1,2 @@
 Documentation for running Keystone with Apache HTTPD is in
-doc/source/apache-httpd.rst
+doc/source/install/