diff --git a/_data/links.yml b/_data/links.yml
index a3ead4b..54f859d 100644
--- a/_data/links.yml
+++ b/_data/links.yml
@@ -9,14 +9,14 @@
 
 offlineimap:
   organization: 'https://github.com/OfflineIMAP'
-  project: 'https://github.com/OfflineIMAP/offlineimap'
-  repository: 'https://github.com/OfflineIMAP/offlineimap.git'
-  downloads: 'https://github.com/OfflineIMAP/offlineimap/tags'
-  issues: 'https://github.com/OfflineIMAP/offlineimap/issues'
+  project: 'https://github.com/OfflineIMAP/offlineimap3'
+  repository: 'https://github.com/OfflineIMAP/offlineimap3.git'
+  downloads: 'https://github.com/OfflineIMAP/offlineimap3/tags'
+  issues: 'https://github.com/OfflineIMAP/offlineimap3/issues'
   rss:
-    commits: 'https://github.com/OfflineIMAP/offlineimap/commits/next.atom'
+    commits: 'https://github.com/OfflineIMAP/offlineimap3/commits/next.atom'
   blobs:
-    contributing: 'https://github.com/OfflineIMAP/offlineimap/blob/next/CONTRIBUTING.rst'
+    contributing: 'https://github.com/OfflineIMAP/offlineimap3/blob/next/CONTRIBUTING.rst'
 
 imapfw:
   website: 'http://imapfw.offlineimap.org'
diff --git a/_doc/FAQ.md b/_doc/FAQ.md
index 493eef3..e312aee 100644
--- a/_doc/FAQ.md
+++ b/_doc/FAQ.md
@@ -524,7 +524,7 @@ set folder=$HOME/Maildirpath
 
 ### What can I configure? Is there a list of options?
 
-Yes, there is! Have a look [here](https://github.com/OfflineIMAP/offlineimap/blob/master/offlineimap.conf).
+Yes, there is! Have a look [here](https://github.com/OfflineIMAP/offlineimap3/blob/master/offlineimap.conf).
 
 
 ## Advanced questions
diff --git a/_doc/website-quick-start.md b/_doc/website-quick-start.md
index 9a0540a..7231ecd 100644
--- a/_doc/website-quick-start.md
+++ b/_doc/website-quick-start.md
@@ -44,7 +44,7 @@ $ cd ./website
 If you don't have the offlineimap Git sources, you can download the script:
 
 {% highlight bash %}
-$ wget 'https://raw.githubusercontent.com/OfflineIMAP/offlineimap/next/scripts/get-repository.sh'-O get-repository.sh
+$ wget 'https://raw.githubusercontent.com/OfflineIMAP/offlineimap3/next/scripts/get-repository.sh' -O get-repository.sh
 $ ./scripts/get-repository.sh website
 {% endhighlight %}
 
diff --git a/_includes/head.html b/_includes/head.html
index 76ae3ec..eb15c23 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -37,7 +37,7 @@
 
   <script>
     ((window.gitter = {}).chat = {}).options = {
-      room: 'OfflineIMAP/offlineimap'
+      room: 'OfflineIMAP/offlineimap3'
     };
   </script>
   <script src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer></script>
diff --git a/_includes/home.md b/_includes/home.md
index d383f5b..0d9032d 100644
--- a/_includes/home.md
+++ b/_includes/home.md
@@ -11,33 +11,33 @@ Github.
 -->
 
 {: .metainfo}
-Latest stable: [{{ latest.stable }}](https://github.com/OfflineIMAP/offlineimap/releases/tag/{{ latest.stable }})
+Latest stable: [{{ latest.stable }}](https://github.com/OfflineIMAP/offlineimap3/releases/tag/{{ latest.stable }})
 
 {:style="float: left; margin-right: 20px; width: 30px;"}
 ![OfflineIMAP logo]({{ links.logos.scalable }})
 
 {:style="float: left; margin-right: 20px;"}
 <a class="github-button"
-href="https://github.com/OfflineIMAP/offlineimap/fork"
+href="https://github.com/OfflineIMAP/offlineimap3/fork"
 data-icon="octicon-repo-forked" data-style="mega"
-data-count-href="/OfflineIMAP/offlineimap/network"
-data-count-api="/repos/OfflineIMAP/offlineimap#forks_count"
+data-count-href="/OfflineIMAP/offlineimap3/network"
+data-count-api="/repos/OfflineIMAP/offlineimap3#forks_count"
 data-count-aria-label="# forks on GitHub" aria-label="Fork
-OfflineIMAP/offlineimap on GitHub">Fork</a>
+OfflineIMAP/offlineimap3 on GitHub">Fork</a>
 
-<a class="github-button" href="https://github.com/OfflineIMAP/offlineimap"
+<a class="github-button" href="https://github.com/OfflineIMAP/offlineimap3"
 data-icon="octicon-star" data-style="mega"
-data-count-href="/OfflineIMAP/offlineimap/stargazers"
-data-count-api="/repos/OfflineIMAP/offlineimap#stargazers_count"
+data-count-href="/OfflineIMAP/offlineimap3/stargazers"
+data-count-api="/repos/OfflineIMAP/offlineimap3#stargazers_count"
 data-count-aria-label="# stargazers on GitHub" aria-label="Star
-OfflineIMAP/offlineimap on GitHub">Star</a>
+OfflineIMAP/offlineimap3 on GitHub">Star</a>
 
 <script async defer id="github-bjs" src="https://buttons.github.io/buttons.js"></script>
 
 
 > ***"Get the emails where you need them."***
 
-[![Gitter](https://badges.gitter.im/OfflineIMAP/offlineimap.svg)](https://gitter.im/OfflineIMAP/offlineimap?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Gitter](https://badges.gitter.im/OfflineIMAP/offlineimap3.svg)](https://gitter.im/OfflineIMAP/offlineimap3?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 # Introduction
 
diff --git a/assets/js/news.coffee b/assets/js/news.coffee
index 558bbbc..be8bf59 100644
--- a/assets/js/news.coffee
+++ b/assets/js/news.coffee
@@ -44,7 +44,7 @@ class Releases extends NsJSON
     for item in @items
       line = ''
       version = item.name
-      version_url = 'https://github.com/OfflineIMAP/offlineimap/tree/' + version
+      version_url = 'https://github.com/OfflineIMAP/offlineimap3/tree/' + version
       tarball = item.tarball_url
       zipball = item.zipball_url
       upload_url = 'http://www.offlineimap.org/uploads/offlineimap-' + version + '.tar.gz'
@@ -91,7 +91,7 @@ fillerJSON = (url, objType, limit, where) ->
 # Called from news.html.
 #
 fillNews = ->
-  fillerJSON('https://api.github.com/repos/offlineimap/offlineimap/tags',
+  fillerJSON('https://api.github.com/repos/offlineimap/offlineimap3/tags',
     Releases, 14, '#releases')
 
 #
diff --git a/documentation.md b/documentation.md
index c57b3ab..c717b1f 100644
--- a/documentation.md
+++ b/documentation.md
@@ -39,7 +39,7 @@ Don't change the fixed id: there is a reference to here from the about page.
   - [https://wiki.archlinux.org/index.php/OfflineIMAP](https://wiki.archlinux.org/index.php/OfflineIMAP)
 - [Installation]({{ site.base }}/doc/installation.html)
 - [Quick Start]({{ site.base }}/doc/quick_start.html)
-- [offlineimap.conf](https://github.com/OfflineIMAP/offlineimap/blob/master/offlineimap.conf)
+- [offlineimap.conf](https://github.com/OfflineIMAP/offlineimap3/blob/master/offlineimap.conf)
 - [Configuration Examples]({{ site.base }}/doc/conf_examples.html)
 
 ### Man pages