diff --git a/README.rst b/README.rst
index 4639a30e50..3de85cbf4c 100644
--- a/README.rst
+++ b/README.rst
@@ -2,8 +2,21 @@
 Octavia
 =======
 
+.. image:: https://img.shields.io/pypi/v/octavia.svg
+    :target: https://pypi.python.org/pypi/octavia/
+    :alt: Latest Version
+
+.. image:: https://img.shields.io/pypi/dm/octavia.svg
+    :target: https://pypi.python.org/pypi/octavia/
+    :alt: Downloads
+
 Operator-grade open source scalable load balancer.
 
+* Free software: Apache license
+* Documentation: http://docs.openstack.org/developer/octavia
+* Source: http://git.openstack.org/cgit/openstack/octavia
+* Bugs: http://bugs.launchpad.net/octavia/
+
 The Octavia project seeks to become the standard operator-grade load balancer
 in use in large OpenStack deployments. Note that it is not competing with the
 Neutron LBaaS extension and may never actually replace it. Rather, Octavia
diff --git a/setup.cfg b/setup.cfg
index 4908f5475c..7ea64ca2f4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,13 +1,13 @@
 [metadata]
 name = octavia
-summary = OpenStack Octavia Scalable Load Balancer as as Service
+summary = OpenStack Octavia Scalable Load Balancer as a Service
 description-file =
     README.rst
 author = OpenStack
 author-email = openstack-dev@lists.openstack.org
 home-page = http://www.openstack.org/
 classifier =
-    Development Status :: 2 - Pre-Alpha
+    Development Status :: 4 - Beta
     Environment :: OpenStack
     Intended Audience :: Developers
     Intended Audience :: Information Technology