diff --git a/Makefile.plain b/Makefile.plain
index aaff7ca..9be80b6 100644
--- a/Makefile.plain
+++ b/Makefile.plain
@@ -34,7 +34,7 @@ install: install-check
 	@sed "s,^_,,g;s,^Exec=.*$$,Exec=$(bindir)/jhbuild gui,;s,^X-GNOME-Bugzilla-Version=.*$$,," \
 		< jhbuild.desktop.in.in > $(desktopdir)/jhbuild.desktop
 
-	@[ -f $(HOME)/.jhbuildrc ]||echo "Don't forget to create ~/.jhbuildrc"
+	@[ -f $(HOME)/.config/jhbuildrc ]||echo "Don't forget to create ~/.config/jhbuildrc"
 	install -m755 install-check $(bindir)/install-check
 
 	# if ~/bin/jbuild exists, it is most likely an old version, and it will
diff --git a/README b/README
index ed19489..2981a36 100644
--- a/README
+++ b/README
@@ -33,7 +33,7 @@ JHBuild uses a command line syntax similar to tools like CVS:
 The global JHBuild options are:
 
   -f, --file config
-  Use an alternative configuration file instead of the default ~/.jhbuildrc.
+  Use an alternative configuration file instead of the default ~/.config/jhbuildrc.
 
   -m, --moduleset moduleset
   Use a module set other than the module set listed in the
diff --git a/buildbot/README b/buildbot/README
index cafbebb..a315814 100644
--- a/buildbot/README
+++ b/buildbot/README
@@ -1,5 +1,5 @@
 You must at minimum edit those two lines in master.cfg:
  c['jhbuild'] = "~/bin/jhbuild"
- c['jhbuildrc'] = "/home/fred/.jhbuildrc"
+ c['jhbuildrc'] = "/home/fred/.config/jhbuildrc"
 
 You must also define slaves in the slaves.csv file.
diff --git a/doc/C/jhbuild.xml b/doc/C/jhbuild.xml
index 8481258..829d7c3 100644
--- a/doc/C/jhbuild.xml
+++ b/doc/C/jhbuild.xml
@@ -140,17 +140,17 @@
 <prompt>$</prompt></screen>
 
       <para>Before running JHBuild, it is necessary to set up a configuration
-        file located at <filename>~/.jhbuildrc</filename>.</para>
+        file located at <filename>~/.config/jhbuildrc</filename>.</para>
     </section>
 
     <section id="getting-started-configure">
       <title>Configuring JHBuild</title>
 
-      <para>The <filename>~/.jhbuildrc</filename> file uses Python syntax to
+      <para>The <filename>~/.config/jhbuildrc</filename> file uses Python syntax to
         set configuration variables for JHBuild. An example is provided with
         JHBuild, see <filename>examples/sample.jhbuildrc</filename>. Copy
         <filename>examples/sample.jhbuildrc</filename> to
-        <filename>~/.jhbuildrc</filename> and customize as required.</para>
+        <filename>~/.config/jhbuildrc</filename> and customize as required.</para>
 
       <para>The sample configuration will make JHBuild build the
         <application>meta-gnome-core</application> and
@@ -317,7 +317,7 @@
 
       <para>After set up is complete, JHBuild can be used to build software.
         To build all the modules selected in the
-        <filename>~/.jhbuildrc</filename> file, run the following command:
+        <filename>~/.config/jhbuildrc</filename> file, run the following command:
       </para>
 
 <screen><prompt>$</prompt> <userinput>jhbuild build</userinput></screen>
@@ -482,7 +482,7 @@
 
       <para>Setup JHBuild on the new
         <systemitem class="username">gnomedev</systemitem> account. Copy or
-        soft-link <filename>~/.jhbuildrc</filename> and
+        soft-link <filename>~/.config/jhbuildrc</filename> and
         <filename>~/.local/bin/jhbuild</filename> to
         <systemitem class="username">gnomedev</systemitem> home directory.
       </para>
@@ -681,7 +681,7 @@ Type=Application</programlisting>
 <screen><prompt>$</prompt> <userinput>jhbuild bot --setup</userinput></screen>
 
       <para>Once this step has completed successfully, three new configuration
-        variables are required in <filename>~/.jhbuildrc</filename>.</para>
+        variables are required in <filename>~/.config/jhbuildrc</filename>.</para>
 
       <note>
         <para>It is not possible to use an alternate configuration file, the
@@ -739,7 +739,7 @@ jhbuildbot_password = 'password'
         </term>
         <listitem>
           <simpara>Use an alternative configuration file instead of the
-            default <filename>~/.jhbuildrc</filename>.</simpara>
+            default <filename>~/.config/jhbuildrc</filename>.</simpara>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -1489,7 +1489,7 @@ libgnomecanvas is missing branch definition for gnome-2-20
   <section id="config-reference">
     <title>Configuration File Reference</title>
 
-    <para>The <filename>~/.jhbuildrc</filename> file uses standard Python
+    <para>The <filename>~/.config/jhbuildrc</filename> file uses standard Python
       syntax. The file is run, and the resulting variables defined in the
       namespace are used to control how JHBuild acts. A set of default values
       are inserted into the namespace before running the user's configuration
diff --git a/examples/sample.jhbuildrc b/examples/sample.jhbuildrc
index ed68f19..5b8df12 100644
--- a/examples/sample.jhbuildrc
+++ b/examples/sample.jhbuildrc
@@ -1,6 +1,6 @@
 # -*- mode: python -*-
 
-# edit this file to match your settings and copy it to ~/.jhbuildrc
+# edit this file to match your settings and copy it to ~/.config/jhbuildrc
 
 # if you have a GNOME git account, uncomment this line
 # repos['git.gnome.org'] = 'ssh://user@git.gnome.org/git/'
diff --git a/jhbuild/defaults.jhbuildrc b/jhbuild/defaults.jhbuildrc
index 9041028..8bff744 100644
--- a/jhbuild/defaults.jhbuildrc
+++ b/jhbuild/defaults.jhbuildrc
@@ -1,6 +1,6 @@
 # -*- mode: python -*-
-# This file holds the default values for the ~/.jhbuildrc file.
-# Do not copy this to ~/.jhbuildrc
+# This file holds the default values for the ~/.config/jhbuildrc file.
+# Do not copy this to ~/.config/jhbuildrc
 
 import os, sys
 
@@ -172,4 +172,4 @@ dvcs_mirror_dir = None
 
 # A string displayed before JHBuild executes a command. String may contain the
 # variables %(command)s, %(cwd)s
-print_command_pattern = '%(command)s'
\ No newline at end of file
+print_command_pattern = '%(command)s'
diff --git a/jhbuild/moduleset.py b/jhbuild/moduleset.py
index aacd4a9..9f301e3 100644
--- a/jhbuild/moduleset.py
+++ b/jhbuild/moduleset.py
@@ -480,5 +480,5 @@ def warn_local_modulesets(config):
     logging.info(
             _('Modulesets were edited locally but JHBuild is configured '\
               'to get them from the network, perhaps you need to add '\
-              'use_local_modulesets = True to your .jhbuildrc.'))
+              'use_local_modulesets = True to your jhbuildrc.'))
 
diff --git a/jhbuild/versioncontrol/arch.py b/jhbuild/versioncontrol/arch.py
index 7a2b411..51c09a0 100644
--- a/jhbuild/versioncontrol/arch.py
+++ b/jhbuild/versioncontrol/arch.py
@@ -89,7 +89,7 @@ class ArchRepository(Repository):
         if name in self.config.branches:
             module = self.config.branches[name]
             if not module:
-                raise FatalError(_('branch for %s has wrong override, check your .jhbuildrc') % name)
+                raise FatalError(_('branch for %s has wrong override, check your jhbuildrc') % name)
         else:
             if module is None:
                 module = name
diff --git a/jhbuild/versioncontrol/bzr.py b/jhbuild/versioncontrol/bzr.py
index 4552668..2033d42 100644
--- a/jhbuild/versioncontrol/bzr.py
+++ b/jhbuild/versioncontrol/bzr.py
@@ -71,7 +71,7 @@ class BzrRepository(Repository):
         if name in self.config.branches:
             module_href = self.config.branches[name]
             if not module_href:
-                raise FatalError(_('branch for %s has wrong override, check your .jhbuildrc') % name)
+                raise FatalError(_('branch for %s has wrong override, check your jhbuildrc') % name)
 
         if module is None:
             module = name
diff --git a/jhbuild/versioncontrol/darcs.py b/jhbuild/versioncontrol/darcs.py
index 525a7f8..62bab50 100644
--- a/jhbuild/versioncontrol/darcs.py
+++ b/jhbuild/versioncontrol/darcs.py
@@ -52,7 +52,7 @@ class DarcsRepository(Repository):
         if name in self.config.branches:
             module = self.config.branches[name]
             if not module:
-                raise FatalError(_('branch for %s has wrong override, check your .jhbuildrc') % name)
+                raise FatalError(_('branch for %s has wrong override, check your jhbuildrc') % name)
         else:
             if module is None:
                 module = name
diff --git a/jhbuild/versioncontrol/fossil.py b/jhbuild/versioncontrol/fossil.py
index ffd2c08..8e29cc5 100644
--- a/jhbuild/versioncontrol/fossil.py
+++ b/jhbuild/versioncontrol/fossil.py
@@ -46,7 +46,7 @@ class FossilRepository(Repository):
         if name in self.config.branches:
             module = self.config.branches[name]
             if not module:
-                raise FatalError(_('branch for %s has wrong override, check your .jhbuildrc') % name)
+                raise FatalError(_('branch for %s has wrong override, check your jhbuildrc') % name)
         else:
             if module is None:
                 module = name
diff --git a/jhbuild/versioncontrol/hg.py b/jhbuild/versioncontrol/hg.py
index 72d5df8..29a30fa 100644
--- a/jhbuild/versioncontrol/hg.py
+++ b/jhbuild/versioncontrol/hg.py
@@ -50,7 +50,7 @@ class HgRepository(Repository):
         if name in self.config.branches:
             module = self.config.branches[name]
             if not module:
-                raise FatalError(_('branch for %s has wrong override, check your .jhbuildrc') % name)
+                raise FatalError(_('branch for %s has wrong override, check your jhbuildrc') % name)
         else:
             if module is None:
                 module = name
diff --git a/jhbuild/versioncontrol/mtn.py b/jhbuild/versioncontrol/mtn.py
index b731de2..2c1da1f 100644
--- a/jhbuild/versioncontrol/mtn.py
+++ b/jhbuild/versioncontrol/mtn.py
@@ -49,7 +49,7 @@ class MonotoneRepository(Repository):
         if name in self.config.branches:
             module = self.config.branches[module]
             if not module:
-                raise FatalError(_('branch for %s has wrong override, check your .jhbuildrc') % name)
+                raise FatalError(_('branch for %s has wrong override, check your jhbuildrc') % name)
 
         if not branch:
             branch = self.defbranch
diff --git a/jhbuild/versioncontrol/tarball.py b/jhbuild/versioncontrol/tarball.py
index f9d9333..f016fa3 100644
--- a/jhbuild/versioncontrol/tarball.py
+++ b/jhbuild/versioncontrol/tarball.py
@@ -64,7 +64,7 @@ class TarballRepository(Repository):
         if name in self.config.branches:
             module = self.config.branches[name]
             if not module:
-                raise FatalError(_('branch for %s has wrong override, check your .jhbuildrc') % name)
+                raise FatalError(_('branch for %s has wrong override, check your jhbuildrc') % name)
         else:
             if module is None:
                 module = name
