diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -23,5 +23,4 @@ syntax: regexp
 ^RhodeCode\.egg-info$
 ^rc.*\.ini$
 ^fabfile.py
-^\.rhodecode$
 ^\.idea$
diff --git a/rhodecode/bin/base.py b/rhodecode/bin/base.py
--- a/rhodecode/bin/base.py
+++ b/rhodecode/bin/base.py
@@ -37,7 +37,7 @@ except ImportError:
     except ImportError:
         import json
 
-CONFIG_NAME = '.rhodecode'
+CONFIG_NAME = '.config/kallithea'
 FORMAT_PRETTY = 'pretty'
 FORMAT_JSON = 'json'
 
diff --git a/rhodecode/bin/rhodecode_gist.py b/rhodecode/bin/rhodecode_gist.py
--- a/rhodecode/bin/rhodecode_gist.py
+++ b/rhodecode/bin/rhodecode_gist.py
@@ -48,7 +48,7 @@ def argparser(argv):
     group = parser.add_argument_group('config')
     group.add_argument('--apikey', help='api access key')
     group.add_argument('--apihost', help='api host')
-    group.add_argument('--config', help='config file path DEFAULT: ~/.rhodecode')
+    group.add_argument('--config', help='config file path DEFAULT: ~/.config/kallithea')
     group.add_argument('--save-config', action='store_true',
                        help='save the given config into a file')