diff --git a/demoapp/setup.py b/demoapp/setup.py
index 4bef32e8..dd8695d4 100644
--- a/demoapp/setup.py
+++ b/demoapp/setup.py
@@ -22,8 +22,8 @@ setup(
     author='Doug Hellmann',
     author_email='doug.hellmann@gmail.com',
 
-    url='https://github.com/dreamhost/cliff',
-    download_url='https://github.com/dreamhost/cliff/tarball/master',
+    url='https://github.com/openstack/cliff',
+    download_url='https://github.com/openstack/cliff/tarball/master',
 
     classifiers=['Development Status :: 3 - Alpha',
                  'License :: OSI Approved :: Apache Software License',
diff --git a/doc/source/install.rst b/doc/source/install.rst
index ad9a2114..30a99450 100644
--- a/doc/source/install.rst
+++ b/doc/source/install.rst
@@ -42,10 +42,10 @@ or::
 Source Code
 ===========
 
-The source is hosted on github: https://github.com/dreamhost/cliff
+The source is hosted on github: http://git.openstack.org/cgit/openstack/cliff
 
 Reporting Bugs
 ==============
 
 Please report bugs through the github project:
-https://github.com/dreamhost/cliff/issues
+https://bugs.launchpad.net/python-cliff