diff --git a/fabfile.py b/fabfile.py
index 8644cb96..ca1da791 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -4,7 +4,7 @@ import posixpath
 
 
 env.project_name = 'umap'
-env.repository = 'https://yohanboniface@bitbucket.org/yohanboniface/umap.git'
+env.repository = 'https://github.com/umap-project/umap.git'
 env.local_branch = 'master'
 env.remote_ref = 'origin/master'
 env.requirements_file = 'requirements.txt'
diff --git a/umap/__init__.py b/umap/__init__.py
index c9427d09..28412995 100644
--- a/umap/__init__.py
+++ b/umap/__init__.py
@@ -2,6 +2,6 @@
 VERSION = (0, 7, 6)
 
 __author__ = 'Yohan Boniface'
-__contact__ = "yb@enix.org"
-__homepage__ = "https://bitbucket.org/yohanboniface/umap"
+__contact__ = "ybon@openstreetmap.fr"
+__homepage__ = "https://github.com/umap-project/umap"
 __version__ = ".".join(map(str, VERSION))
diff --git a/umap/templates/umap/about_summary.html b/umap/templates/umap/about_summary.html
index b5f1ffbe..65a9d801 100644
--- a/umap/templates/umap/about_summary.html
+++ b/umap/templates/umap/about_summary.html
@@ -20,7 +20,7 @@
     <div class="col quarter mwide">
       <img class="colophon" src="{{ STATIC_URL }}umap/img/opensource.svg" />
       <p class="note">
-        {% blocktrans with repo_url="https://bitbucket.org/yohanboniface/umap" %}And it's <a href="{{ repo_url }}">open source</a>!{% endblocktrans %}
+        {% blocktrans with repo_url="https://github.com/umap-project/umap" %}And it's <a href="{{ repo_url }}">open source</a>!{% endblocktrans %}
       </p>
     </div>
   </div>
diff --git a/umap/templates/umap/home.html b/umap/templates/umap/home.html
index e483a83a..0e73d711 100644
--- a/umap/templates/umap/home.html
+++ b/umap/templates/umap/home.html
@@ -7,7 +7,7 @@
 {% if DEMO_SITE %}
 <div class="wrapper demo-instance-warning">
   <div class="row">
-    {% blocktrans with repo_url="https://bitbucket.org/yohanboniface/umap" stable_url="http://umap.openstreetmap.fr" %}This is a demo instance, used for tests and pre-rolling releases. If you need a stable instance, please use <a href="{{ stable_url }}">{{ stable_url }}</a>. You can also host your own instance, it's <a href="{{ repo_url }}">open source</a>!{% endblocktrans %}
+    {% blocktrans with repo_url="https://github.com/umap-project/umap" stable_url="http://umap.openstreetmap.fr" %}This is a demo instance, used for tests and pre-rolling releases. If you need a stable instance, please use <a href="{{ stable_url }}">{{ stable_url }}</a>. You can also host your own instance, it's <a href="{{ repo_url }}">open source</a>!{% endblocktrans %}
   </div>
 </div>
 {% endif %}