diff --git a/README.rst b/README.rst
index 4a6e401..b732e75 100644
--- a/README.rst
+++ b/README.rst
@@ -618,7 +618,7 @@ and answer questions related to pypuppetdb and Puppetboard.
 There is also a `GoogleGroup`_ to exchange questions and discussions. Please
 note that this group contains discussions of other Puppet Community projects.
 
-.. _issue: https://github.com/puppet-community/puppetboard/issues
+.. _issue: https://github.com/voxpupuli/puppetboard/issues
 .. _IRCnet: http://www.ircnet.org
 .. _Freenode: http://freenode.net
 .. _GoogleGroup: https://groups.google.com/forum/?hl=en#!forum/puppet-community
diff --git a/puppetboard/templates/layout.html b/puppetboard/templates/layout.html
index 0f9829b..a465103 100644
--- a/puppetboard/templates/layout.html
+++ b/puppetboard/templates/layout.html
@@ -48,7 +48,7 @@
           {% endfor %}
         </div>
       </div>
-      <div class="item right"><a href="https://github.com/puppet-community/puppetboard" target="_blank">v0.1.3</a></div>
+      <div class="item right"><a href="https://github.com/voxpupuli/puppetboard" target="_blank">v0.1.3</a></div>
     </div>
     <div class="ui grid padding-bottom">
       <div class="one wide column"></div>
@@ -64,7 +64,7 @@
 
     <footer class="ui absolute fixed bottom">
       <div>
-        Copyright &copy; 2013-{{ now('%Y') }} <a href="https://github.com/puppet-community" target="_blank">Puppet Community</a>. <span style="float:right">Live from PuppetDB.</span>
+        Copyright &copy; 2013-{{ now('%Y') }} <a href="https://github.com/voxpupuli" target="_blank">Puppet Community</a>. <span style="float:right">Live from PuppetDB.</span>
       </div>
     </footer>
 
diff --git a/setup.py b/setup.py
index 56d8053..25def84 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ setup(
     author='Daniele Sluijters',
     author_email='daniele.sluijters+pypi@gmail.com',
     packages=find_packages(),
-    url='https://github.com/puppet-community/puppetboard',
+    url='https://github.com/voxpupuli/puppetboard',
     license='Apache License 2.0',
     description='Web frontend for PuppetDB',
     include_package_data=True,