diff --git a/tools/build/gnome-shell-build-setup.sh b/tools/build/gnome-shell-build-setup.sh
index f0c3f28ed..d546bb4ac 100755
--- a/tools/build/gnome-shell-build-setup.sh
+++ b/tools/build/gnome-shell-build-setup.sh
@@ -298,6 +298,20 @@ if [ ! -f $HOME/.jhbuildrc-custom ]; then
     echo "done"
 fi
 
+if [ -d $HOME/gnome-shell -a \! -d $HOME/gnome ] ; then
+    cat <<EOF
+WARNING:
+  The old source and install directory '$HOME/gnome-shell' exists, but
+  '$HOME/gnome' doesn't. An empty $HOME/gnome will be created.
+
+  To avoid starting again from scratch you should remove the empty directory
+  and move your old '$HOME/gnome-shell' to '$HOME/gnome':
+
+    rm -rf $HOME/gnome
+    mv $HOME/gnome-shell $HOME/gnome
+EOF
+fi
+
 echo "Installing modules as system packages when possible"
 $HOME/bin/jhbuild sysdeps --install
 
diff --git a/tools/build/jhbuildrc-gnome-shell b/tools/build/jhbuildrc-gnome-shell
index a4c7fc244..5de33188b 100644
--- a/tools/build/jhbuildrc-gnome-shell
+++ b/tools/build/jhbuildrc-gnome-shell
@@ -23,10 +23,10 @@ moduleset = 'gnome-apps-3.6'
 modules = [ 'meta-gnome-core-shell' ]
 
 # what directory should the source be checked out to?
-checkoutroot = os.path.expanduser('~/gnome-shell/source')
+checkoutroot = os.path.expanduser('~/gnome/source')
 
 # the prefix to configure/install modules to (must have write access)
-prefix = os.path.expanduser('~/gnome-shell/install')
+prefix = os.path.expanduser('~/gnome/install')
 
 # reduce what we build as much as possible
 ignore_suggests = True