diff --git a/doc/Makefile b/doc/Makefile
index f750fb18..ea6e26e3 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -124,7 +124,7 @@ gh-pages:
 
 gitwash:
 	python tools/gitwash/gitwash_dumper.py source scikit-image \
-	--project-url=http://scikit-image.org \
+	--project-url=http://skimage.org \
 	--project-ml-url=http://groups.google.com/group/scikit-image \
 	--repo-name=scikit-image \
 	--github-user=scikit-image \
diff --git a/doc/release/release_0.3.txt b/doc/release/release_0.3.txt
index 617c3614..743e388d 100644
--- a/doc/release/release_0.3.txt
+++ b/doc/release/release_0.3.txt
@@ -9,11 +9,11 @@ Python (>=2.6 or 3.x), NumPy and SciPy can be installed.
 
 For more information, visit our website
 
-  http://scikit-image.org
+  http://skimage.org
 
 or the examples gallery at
 
-   http://scikit-image.org/docs/0.3/auto_examples/
+   http://skimage.org/docs/0.3/auto_examples/
 
 New Features
 ------------
diff --git a/doc/release/release_0.4.txt b/doc/release/release_0.4.txt
index 04679271..2e8092dd 100644
--- a/doc/release/release_0.4.txt
+++ b/doc/release/release_0.4.txt
@@ -6,7 +6,7 @@ toolbox for SciPy.
 
 Please visit our examples gallery to see what we've been up to:
 
-   http://scikit-image.org/docs/0.4/auto_examples/
+   http://skimage.org/docs/0.4/auto_examples/
 
 Note that, in this release, we renamed the module from ``scikits.image`` to
 ``skimage``, to work around name space conflicts with other scikits (similarly,
@@ -20,7 +20,7 @@ This release runs under all major operating systems where Python (>=2.6 or
 
 For more information, visit our website
 
-  http://scikit-image.org
+  http://skimage.org
 
 New Features
 ------------
diff --git a/doc/release/release_0.5.txt b/doc/release/release_0.5.txt
index 652f45fa..4977046a 100644
--- a/doc/release/release_0.5.txt
+++ b/doc/release/release_0.5.txt
@@ -6,7 +6,7 @@ toolbox for SciPy.
 
 For more information, please visit our website
 
-  http://scikit-image.org
+  http://skimage.org
 
 New Features
 ------------
diff --git a/doc/source/_static/docversions.js b/doc/source/_static/docversions.js
index 660553e0..7fbc57a0 100644
--- a/doc/source/_static/docversions.js
+++ b/doc/source/_static/docversions.js
@@ -12,6 +12,6 @@ function insert_version_links() {
         document.write(open_list);
         document.write('<a href="URL">skimage VERSION</a> </li>\n'
                         .replace('VERSION', labels[i])
-                        .replace('URL', 'http://scikit-image.org/docs/' + labels[i]));
+                        .replace('URL', 'http://skimage.org/docs/' + labels[i]));
     }
 }
diff --git a/doc/source/gitwash/this_project.inc b/doc/source/gitwash/this_project.inc
index 349b92ba..6010831f 100644
--- a/doc/source/gitwash/this_project.inc
+++ b/doc/source/gitwash/this_project.inc
@@ -1,5 +1,5 @@
 .. scikit-image
-.. _scikit-image: http://scikit-image.org
+.. _scikit-image: http://skimage.org
 .. _`scikit-image github`: http://github.com/scikit-image/scikit-image
 
 .. _`scikit-image mailing list`: http://groups.google.com/group/scikit-image
diff --git a/doc/source/overview.txt b/doc/source/overview.txt
index 5a4e6123..3acdeebf 100644
--- a/doc/source/overview.txt
+++ b/doc/source/overview.txt
@@ -1,7 +1,7 @@
 Image Processing SciKit
 =======================
 
-The `scikit-image <http://scikit-image.org>`__ SciKit (toolkit for
+The `scikit-image <http://skimage.org>`__ SciKit (toolkit for
 `SciPy <http://www.scipy.org>`__) extends ``scipy.ndimage`` to provide
 a versatile set of image processing routines.  It is written in the
 `Python <http://www.python.org>`_ language.
@@ -12,7 +12,7 @@ mailing list (address provided below).
 
 Homepage
 --------
-http://scikit-image.org
+http://skimage.org
 
 Source, bugs and patches
 ------------------------
diff --git a/doc/source/random_gallery.py b/doc/source/random_gallery.py
index 47ce89a2..3358b3f0 100644
--- a/doc/source/random_gallery.py
+++ b/doc/source/random_gallery.py
@@ -32,8 +32,8 @@ gallery_div = '''\
 examples = glob.glob(os.path.join(example_dir, 'plot_*.py'))
 
 images, links = [], []
-image_url = 'http://scikit-image.org/docs/dev/_images/%s.png'
-link_url = 'http://scikit-image.org/docs/dev/auto_examples/%s.html'
+image_url = 'http://skimage.org/docs/dev/_images/%s.png'
+link_url = 'http://skimage.org/docs/dev/auto_examples/%s.html'
 
 for e in examples:
     e = os.path.basename(e)
diff --git a/doc/source/themes/scikit-image/layout.html b/doc/source/themes/scikit-image/layout.html
index 58424f2f..a1755670 100644
--- a/doc/source/themes/scikit-image/layout.html
+++ b/doc/source/themes/scikit-image/layout.html
@@ -79,7 +79,7 @@
     {%- block extrahead %}{% endblock %}
 </head>
 <body class="container">
-    <a href="http://scikit-image.org" class="logo"><img src="{{ pathto('_static/', 1) }}img/logo.png" alt=""></a>
+    <a href="http://skimage.org" class="logo"><img src="{{ pathto('_static/', 1) }}img/logo.png" alt=""></a>
     <div class="clearfix"></div>
     <div class="navbar">
         <div class="navbar-inner">