diff --git a/.gitreview b/.gitreview
index fd7871d20..35d93597c 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
 host=review.openstack.org
 port=29418
-project=stackforge/shade.git
\ No newline at end of file
+project=openstack-infra/shade.git
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 5ed928270..ee1e32b0e 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,17 +1,41 @@
-If you would like to contribute to the development of OpenStack,
-you must follow the steps in the "If you're a developer, start here"
-section of this page:
+.. _contributing:
 
-   http://wiki.openstack.org/HowToContribute
+=====================
+Contributing to shade
+=====================
 
-Once those steps have been completed, changes to OpenStack
-should be submitted for review via the Gerrit tool, following
-the workflow documented at:
+If you're interested in contributing to the shade project,
+the following will help get you started.
 
-   http://wiki.openstack.org/GerritWorkflow
+Contributor License Agreement
+-----------------------------
 
-Pull requests submitted through GitHub will be ignored.
+.. index::
+   single: license; agreement
 
-Bugs should be filed on Launchpad, not GitHub:
+In order to contribute to the shade project, you need to have
+signed OpenStack's contributor's agreement.
 
-   https://bugs.launchpad.net/shade
\ No newline at end of file
+.. seealso::
+
+   * http://wiki.openstack.org/HowToContribute
+   * http://wiki.openstack.org/CLA
+
+Project Hosting Details
+-------------------------
+
+Bug tracker
+    http://storyboard.openstack.org
+
+Mailing list (prefix subjects with ``[shade]`` for faster responses)
+    http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-infra
+
+Code Hosting
+    * https://git.openstack.org/cgit/openstack-infra/shade
+
+Code Review
+    https://review.openstack.org/#/q/status:open+project:openstack-infra/shade,n,z
+
+    Please read `GerritWorkflow`_ before sending your first patch for review.
+
+.. _GerritWorkflow: https://wiki.openstack.org/wiki/GerritWorkflow
diff --git a/setup.cfg b/setup.cfg
index 5d0c41551..1756a9c85 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,9 +3,9 @@ name = shade
 summary = Client library for operating OpenStack clouds
 description-file =
     README.rst
-author = Monty Taylor
-author-email = mordred@inaugust.com
-home-page = http://www.openstack.org/
+author = OpenStack Infrastructure Team
+author-email = openstack-infra@lists.openstack.org
+home-page = http://ci.openstack.org/
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -15,9 +15,8 @@ classifier =
     Programming Language :: Python
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
-    Programming Language :: Python :: 2.6
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.3
+    Programming Language :: Python :: 3.4
 
 [build_sphinx]
 source-dir = doc/source
diff --git a/tox.ini b/tox.ini
index 5a1018329..785c44d34 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.6
-envlist = py26,py27,py33,pypy,pep8
+envlist = py26,py27,py34,pypy,pep8
 skipsdist = True
 
 [testenv]