diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 9f8f669..489f06b 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -7,11 +7,11 @@
 .. _maintainers: https://github.com/OfflineIMAP/offlineimap/blob/next/MAINTAINERS.rst
 .. _mailing list: http://lists.alioth.debian.org/mailman/listinfo/offlineimap-project
 .. _Developer's Certificate of Origin: https://github.com/OfflineIMAP/offlineimap/blob/next/docs/doc-src/dco.rst
-.. _Community's website: https://offlineimap.github.io
-.. _APIs in OfflineIMAP: http://offlineimap.github.io/documentation.html#available-apis
-.. _documentation: https://offlineimap.github.io/documentation.html
-.. _Coding Guidelines: http://offlineimap.github.io/doc/CodingGuidelines.html
-.. _Know the status of your patches: http://localhost:4000/doc/GitAdvanced.html#know-the-status-of-your-patch-after-submission
+.. _Community's website: https://offlineimap.org
+.. _APIs in OfflineIMAP: http://offlineimap.org/documentation.html#available-apis
+.. _documentation: https://offlineimap.org/documentation.html
+.. _Coding Guidelines: http://offlineimap.org/doc/CodingGuidelines.html
+.. _Know the status of your patches: http://offlineimap.org/doc/GitAdvanced.html#know-the-status-of-your-patch-after-submission
 
 
 =================
diff --git a/README.md b/README.md
index cd97db2..ae9c6b6 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [offlineimap]: https://github.com/OfflineIMAP/offlineimap
-[website]: http://offlineimap.github.io
+[website]: http://offlineimap.org
 [wiki]: http://github.com/OfflineIMAP/offlineimap/wiki
 
 # OfflineImap
diff --git a/docs/doc-src/index.rst b/docs/doc-src/index.rst
index fb8bdc9..e923a64 100644
--- a/docs/doc-src/index.rst
+++ b/docs/doc-src/index.rst
@@ -1,5 +1,5 @@
 .. OfflineImap documentation master file
-.. _OfflineIMAP: http://offlineimap.github.io
+.. _OfflineIMAP: http://offlineimap.org
 
 
 Welcome to OfflineIMAP's developer documentation
diff --git a/docs/offlineimap.txt b/docs/offlineimap.txt
index f4b844c..858fc0b 100644
--- a/docs/offlineimap.txt
+++ b/docs/offlineimap.txt
@@ -410,4 +410,4 @@ See Also
 --------
 
   offlineimapui(7), openssl(1), signal(7), sqlite3(1).
-  http://offlineimap.github.io
+  http://offlineimap.org
diff --git a/offlineimap.conf b/offlineimap.conf
index bd84d6e..7fbbdf7 100644
--- a/offlineimap.conf
+++ b/offlineimap.conf
@@ -2,7 +2,7 @@
 
 # This file documents *all* possible options and can be quite scary.
 # Looking for a quick start?  Take a look at offlineimap.conf.minimal.
-# More details can be found at http://offlineimap.github.io.
+# More details can be found at http://offlineimap.org .
 
 ##################################################
 # Overview
diff --git a/scripts/get-repository.sh b/scripts/get-repository.sh
index 080815c..a6dad95 100755
--- a/scripts/get-repository.sh
+++ b/scripts/get-repository.sh
@@ -79,7 +79,7 @@ username=$(echo $offlineimap_url | sed -r -e 's,.*github.com.([^/]+)/.*,\1,')
 
 case n$repository in
 	nwebsite)
-		upstream=https://github.com/OfflineIMAP/offlineimap.github.io 
+		upstream=https://github.com/OfflineIMAP/offlineimap.github.io
 		setup website "$upstream"
 		configure_website "$username"
 		final_note website "$upstream"