diff --git a/tools/build-all-rst.sh b/tools/build-all-rst.sh
index 191c54ffd8..c7cd245357 100755
--- a/tools/build-all-rst.sh
+++ b/tools/build-all-rst.sh
@@ -11,7 +11,7 @@ if [[ $# > 0 ]] ; then
     fi
 fi
 
-for guide in user-guide user-guide-admin networking-guide admin-guide-cloud; do
+for guide in user-guide user-guide-admin networking-guide admin-guide-cloud contributor-guide; do
     tools/build-rst.sh doc/$guide $GLOSSARY --build build \
         --target $guide $LINKCHECK
     # Build it only the first time
@@ -19,9 +19,9 @@ for guide in user-guide user-guide-admin networking-guide admin-guide-cloud; do
 done
 
 # Draft guides
-for guide in contributor-guide; do
-    tools/build-rst.sh doc/$guide --build build \
-        --target "draft/$guide" $LINKCHECK
-done
+# for guide in guide_name; do
+#    tools/build-rst.sh doc/$guide --build build \
+#        --target "draft/$guide" $LINKCHECK
+# done
 
 tools/build-install-guides-rst.sh $LINKCHECK
diff --git a/www/draft/draft-index.html b/www/draft/draft-index.html
index 3e2590ead2..bc7532db5d 100644
--- a/www/draft/draft-index.html
+++ b/www/draft/draft-index.html
@@ -78,10 +78,6 @@
                         <h3><i class="fa fa-wrench"></i>Draft Configuration Guides</h3>
                         <a href="/draft/config-reference/content/">Configuration Reference</a>
                     </div>
-                    <div class="docs-link-sections">
-                        <h3><i class="fa fa-users"></i>Draft Contribution Guides</h3>
-                        <a href="/draft/contributor-guide/">Draft OpenStack Documentation Contributor Guide</a>
-                    </div>
                     <div class="docs-link-sections">
                         <h3><i class="fa fa-book"></i>Draft API Guides</h3>
                         <a href="http://developer.openstack.org/draft/firstapp-dotnet/">Writing Your First Application: .Net</a>
@@ -119,7 +115,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>Documentation treated like code, powered by the community - interested?</p>
-                    <a href="https://wiki.openstack.org/wiki/Documentation/HowTo" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                    <a href="http://docs.openstack.org/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
                 </div>
             </div>
         </div>
diff --git a/www/icehouse/index.html b/www/icehouse/index.html
index 5b90f5ea3b..67fcb7da8f 100644
--- a/www/icehouse/index.html
+++ b/www/icehouse/index.html
@@ -118,7 +118,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>Documentation treated like code, powered by the community - interested?</p>
-                    <a href="https://wiki.openstack.org/wiki/Documentation/HowTo" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                    <a href="http://docs.openstack.org/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
                 </div>
             </div>
         </div>
diff --git a/www/index.html b/www/index.html
index 18cbed0d3a..5ae966a903 100644
--- a/www/index.html
+++ b/www/index.html
@@ -134,7 +134,7 @@
         <div class="row docs-contribute-wrapper">
             <div class="col-lg-12">
                 <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="https://wiki.openstack.org/wiki/Documentation/HowTo" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                <a href="http://docs.openstack.org/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
             </div>
         </div>
     </div>
diff --git a/www/juno/index.html b/www/juno/index.html
index f13014325c..54e9757e2c 100644
--- a/www/juno/index.html
+++ b/www/juno/index.html
@@ -125,7 +125,7 @@
             <div class="row docs-contribute-wrapper">
                 <div class="col-lg-12">
                     <p>Documentation treated like code, powered by the community - interested?</p>
-                    <a href="https://wiki.openstack.org/wiki/Documentation/HowTo" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                    <a href="http://docs.openstack.org/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
                 </div>
             </div>
         </div>
diff --git a/www/kilo/index.html b/www/kilo/index.html
index 5961101943..af1ea1bfcb 100644
--- a/www/kilo/index.html
+++ b/www/kilo/index.html
@@ -133,7 +133,7 @@
         <div class="row docs-contribute-wrapper">
             <div class="col-lg-12">
                 <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="https://wiki.openstack.org/wiki/Documentation/HowTo" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                <a href="http://docs.openstack.org/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
             </div>
         </div>
     </div>
diff --git a/www/liberty/index.html b/www/liberty/index.html
index 0157776dae..646ed02c5b 100644
--- a/www/liberty/index.html
+++ b/www/liberty/index.html
@@ -134,7 +134,7 @@
         <div class="row docs-contribute-wrapper">
             <div class="col-lg-12">
                 <p>Documentation treated like code, powered by the community - interested?</p>
-                <a href="https://wiki.openstack.org/wiki/Documentation/HowTo" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
+                <a href="http://docs.openstack.org/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
             </div>
         </div>
     </div>
diff --git a/www/templates/contributor_guides.tmpl b/www/templates/contributor_guides.tmpl
index 78b222d5a1..7a1477a664 100644
--- a/www/templates/contributor_guides.tmpl
+++ b/www/templates/contributor_guides.tmpl
@@ -1,7 +1,7 @@
 
                     <div class="docs-link-sections">
                         <h3 id="contributor-guides"><i class="fa fa-pencil"></i> Contributor Guides</h3>
-                        <a href="http://wiki.openstack.org/Documentation/HowTo">OpenStack Documentation</a>
+                        <a href="http://docs.openstack.org/contributor-guide/index.html">OpenStack Documentation Contributor Guide</a>
                         <a href="/developer/openstack-projects.html">Python Developer Documentation</a>
                         <a href="/developer/language-bindings.html">Language Bindings and Python Clients</a>
                         <a href="/project-team-guide/">OpenStack Project Team Guide</a>