diff --git a/www/developer/openstack-projects.html b/www/developer/openstack-projects.html
index db84449bf0..1c6d2ef144 100644
--- a/www/developer/openstack-projects.html
+++ b/www/developer/openstack-projects.html
@@ -1,9 +1,9 @@
 {% set scriptdir = '../common/js/' %}
 {% set cssdir = '../common/css/' %}
 {% extends "templates/base.tmpl" %}
-{% block pagetitle %}Developers{% endblock %}
+{% block pagetitle %}Services and Libraries{% endblock %}
 {% block title %}
-<a href="http://docs.openstack.org">Documentation</a> &gt; Python developer
+<a href="http://docs.openstack.org">Documentation</a> &gt; Services and Libraries
 {% endblock %}
 {% block content %}
     <!-- Begin Page Content -->
@@ -13,8 +13,8 @@
             <div class="col-lg-8 col-md-8 col-sm-8">
                 <h1>OpenStack Contributor Documentation</h1>
                 <p>
-                This page contains documentation for Python developers,
-                who work on OpenStack itself.
+                This page contains project-specific documentation for
+                OpenStack services and libraries.
                 </p>
        </div>
     </div>
diff --git a/www/index.html b/www/index.html
index c006c98864..baced9817d 100644
--- a/www/index.html
+++ b/www/index.html
@@ -88,6 +88,7 @@
             </div>
             <div class="col-lg-6 col-md-6 col-sm-6">
                 {% include 'templates/user_guides.tmpl' %}
+                {% include 'templates/project_guides.tmpl' %}
                 {% include 'templates/contributor_guides.tmpl' %}
                 {% include 'templates/training_guides.tmpl' %}
             </div>
diff --git a/www/juno/index.html b/www/juno/index.html
index a89c3add66..4f89c09b41 100644
--- a/www/juno/index.html
+++ b/www/juno/index.html
@@ -83,6 +83,7 @@
                 </div>
                 <div class="col-lg-6 col-md-6 col-sm-6">
                     {% include 'templates/user_guides.tmpl' %}
+                    {% include 'templates/project_guides.tmpl' %}
                     {% include 'templates/contributor_guides.tmpl' %}
                     {% include 'templates/training_guides.tmpl' %}
                 </div>
diff --git a/www/kilo/index.html b/www/kilo/index.html
index 93c2178c68..d44b2b6d54 100644
--- a/www/kilo/index.html
+++ b/www/kilo/index.html
@@ -82,6 +82,7 @@
             </div>
             <div class="col-lg-6 col-md-6 col-sm-6">
                 {% include 'templates/user_guides.tmpl' %}
+                {% include 'templates/project_guides.tmpl' %}
                 {% include 'templates/contributor_guides.tmpl' %}
                 {% include 'templates/training_guides.tmpl' %}
             </div>
diff --git a/www/liberty/index.html b/www/liberty/index.html
index 9c11990884..494a3784f3 100644
--- a/www/liberty/index.html
+++ b/www/liberty/index.html
@@ -87,6 +87,7 @@
             </div>
             <div class="col-lg-6 col-md-6 col-sm-6">
                 {% include 'templates/user_guides.tmpl' %}
+                {% include 'templates/project_guides.tmpl' %}
                 {% include 'templates/contributor_guides.tmpl' %}
                 {% include 'templates/training_guides.tmpl' %}
             </div>
diff --git a/www/mitaka/index.html b/www/mitaka/index.html
index fa4187b3d3..58553b4d70 100644
--- a/www/mitaka/index.html
+++ b/www/mitaka/index.html
@@ -88,6 +88,7 @@
             </div>
             <div class="col-lg-6 col-md-6 col-sm-6">
                 {% include 'templates/user_guides.tmpl' %}
+                {% include 'templates/project_guides.tmpl' %}
                 {% include 'templates/contributor_guides.tmpl' %}
                 {% include 'templates/training_guides.tmpl' %}
             </div>
diff --git a/www/templates/contributor_guides.tmpl b/www/templates/contributor_guides.tmpl
index 7980e840fa..903052b563 100644
--- a/www/templates/contributor_guides.tmpl
+++ b/www/templates/contributor_guides.tmpl
@@ -4,10 +4,6 @@
                         <p>Documentation workflow and conventions</p>
                         <a href="http://governance.openstack.org">OpenStack Technical Committee Governance Documents</a>
                         <p>OpenStack Technical Committee reference documents and official resolutions</p>
-                        <a href="/developer/openstack-projects.html">Python Developer Documentation</a>
-                        <p>Documentation for OpenStack developers</p>
-                        <a href="/developer/language-bindings.html">Language Bindings and Python Clients</a>
-                        <p>Documentation for the OpenStack Python bindings</p>
                         <a href="http://specs.openstack.org/">OpenStack Project specifications</a>
                         <p>Specifications for future project features</p>
                         <a href="/project-team-guide/">OpenStack Project Team Guide</a>
diff --git a/www/templates/project_guides.tmpl b/www/templates/project_guides.tmpl
new file mode 100644
index 0000000000..bd1ebe434b
--- /dev/null
+++ b/www/templates/project_guides.tmpl
@@ -0,0 +1,7 @@
+                    <div class="docs-link-sections">
+                        <h3 id="contributor-guides"><i class="fa fa-leaf"></i> Project-specific Guides</h3>
+                        <a href="/developer/openstack-projects.html">Services and Libraries</a>
+                        <p>Documentation for OpenStack services and libraries</p>
+                        <a href="/developer/language-bindings.html">Language Bindings and Python Clients</a>
+                        <p>Documentation for the OpenStack Python bindings and clients</p>
+                    </div>