diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 66a911c..ac0beff 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: http://offlineimap.org
-.. _APIs in OfflineIMAP: http://offlineimap.org/documentation.html#available-apis
-.. _documentation: http://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
+.. _Community's website: http://www.offlineimap.org
+.. _APIs in OfflineIMAP: http://www.offlineimap.org/documentation.html#available-apis
+.. _documentation: http://www.offlineimap.org/documentation.html
+.. _Coding Guidelines: http://www.offlineimap.org/doc/CodingGuidelines.html
+.. _Know the status of your patches: http://www.offlineimap.org/doc/GitAdvanced.html#know-the-status-of-your-patch-after-submission
 
 
 =================
diff --git a/README.md b/README.md
index 3f04a99..056d8b8 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [offlineimap]: http://github.com/OfflineIMAP/offlineimap
-[website]: http://offlineimap.org
+[website]: http://www.offlineimap.org
 [wiki]: http://github.com/OfflineIMAP/offlineimap/wiki
-[blog]: http://offlineimap.org/posts.html
+[blog]: http://www.offlineimap.org/posts.html
 
 # OfflineIMAP
 
diff --git a/docs/doc-src/index.rst b/docs/doc-src/index.rst
index e923a64..5915936 100644
--- a/docs/doc-src/index.rst
+++ b/docs/doc-src/index.rst
@@ -1,5 +1,5 @@
 .. OfflineImap documentation master file
-.. _OfflineIMAP: http://offlineimap.org
+.. _OfflineIMAP: http://www.offlineimap.org
 
 
 Welcome to OfflineIMAP's developer documentation
diff --git a/docs/offlineimap.txt b/docs/offlineimap.txt
index 3ee58ca..33451cc 100644
--- a/docs/offlineimap.txt
+++ b/docs/offlineimap.txt
@@ -428,4 +428,4 @@ See Also
 --------
 
   offlineimapui(7), openssl(1), signal(7), sqlite3(1).
-  http://offlineimap.org
+  http://www.offlineimap.org
diff --git a/offlineimap.conf b/offlineimap.conf
index b9c0991..df5ed95 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.org .
+# More details can be found at http://www.offlineimap.org .
 
 ##################################################
 # Overview
@@ -988,7 +988,7 @@ remoteuser = username
 #
 # If you enable nametrans, you will likely need to set the reversed nametrans on
 # the other side. See the user documentation for details and use cases. They
-# are also online at: http://offlineimap.org/doc/nametrans.html
+# are also online at: http://www.offlineimap.org/doc/nametrans.html
 #
 # This example below will remove "INBOX." from the leading edge of folders
 # (great for Courier IMAP users).
diff --git a/offlineimap/__init__.py b/offlineimap/__init__.py
index a3ec482..3e5ed4d 100644
--- a/offlineimap/__init__.py
+++ b/offlineimap/__init__.py
@@ -11,7 +11,7 @@ __description__ = "Disconnected Universal IMAP Mail Synchronization/Reader Suppo
 __license__  = "Licensed under the GNU GPL v2 or any later version (with an OpenSSL exception)"
 __bigcopyright__ = """%(__productname__)s %(__bigversion__)s
   %(__license__)s""" % locals()
-__homepage__ = "http://offlineimap.org"
+__homepage__ = "http://www.offlineimap.org"
 
 banner = __bigcopyright__
 
diff --git a/test/OLItest/__init__.py b/test/OLItest/__init__.py
index ca6ef61..e6dc341 100644
--- a/test/OLItest/__init__.py
+++ b/test/OLItest/__init__.py
@@ -24,7 +24,7 @@ __author__      = 'Sebastian Spaeth'
 __author_email__= 'Sebastian@SSpaeth.de'
 __description__ = 'Moo'
 __license__  = "Licensed under the GNU GPL v2+ (v2 or any later version)"
-__homepage__ = "http://offlineimap.org"
+__homepage__ = "http://www.offlineimap.org"
 banner = """%(__productname__)s %(__version__)s
   %(__license__)s""" % locals()