diff --git a/README.rst b/README.rst
index a755e250..c4fb8df1 100644
--- a/README.rst
+++ b/README.rst
@@ -4,21 +4,21 @@ Python bindings to the OpenStack Object Storage API
 This is a python client for the Swift API. There's a Python API (the
 ``swiftclient`` module), and a command-line script (``swift``).
 
-You can find the `documentation online`__.
-
-__ http://docs.openstack.org/developer/python-swiftclient/
-
 Development takes place via the usual OpenStack processes as outlined
-in the `OpenStack wiki`__.  The master repository is on GitHub__.
+in the `OpenStack wiki`__.
 
 __ http://docs.openstack.org/infra/manual/developers.html
-__ http://github.com/openstack/python-swiftclient
 
 This code is based on original the client previously included with
-`OpenStack's swift`__ The python-swiftclient is licensed under the
+`OpenStack's Swift`__ The python-swiftclient is licensed under the
 Apache License like the rest of OpenStack.
 
 __ http://github.com/openstack/swift
 
+* Free software: Apache license
+* Documentation: http://docs.openstack.org/developer/python-swiftclient/
+* Source: http://git.openstack.org/cgit/openstack/python-swiftclient/
+* Bugs: http://bugs.launchpad.net/python-swiftclient
+
 .. contents:: Contents:
    :local: