diff --git a/.hgauthors.txt b/.hgauthors.txt
new file mode 100644
index 0000000..5f40e47
--- /dev/null
+++ b/.hgauthors.txt
@@ -0,0 +1,5 @@
+mbscholt = Michiel Scholten <michiel@aquariusoft.org>
+m.scholten = Michiel Scholten <michiel@aquariusoft.org>
+Michiel Scholten = Michiel Scholten <michiel@aquariusoft.org>
+convert-repo = svnconvert <michiel@aquariusoft.org>
+michiel.scholten@sanomamedia.nl = Michiel Scholten <michiel@aquariusoft.org>
diff --git a/.hgrc b/.hgrc
index 6efd409..bf029fe 100644
--- a/.hgrc
+++ b/.hgrc
@@ -1,11 +1,32 @@
 [ui]
-username = Michiel Scholten <michiel@aquariusoft.org>
+#username = Michiel Scholten <michiel@aquariusoft.org>
+username = m.scholten
 
 [extensions]
-graphlog = 
-mercurial_keyring = /home/mbscholt/bin/hg/mercurial_keyring.py
+hgext.mercurial_keyring = ~/workspace/application_addons/mercurial/mercurial_keyring/mercurial_keyring.py
 convert =
 hgext.bookmarks =
-hgext.git = 
+graphlog = 
+hgext.purge=
+hgk=
+hgflow = ~/workspace/application_addons/mercurial/hgflow/src/hgflow.py
+hggit = ~/workspace/application_addons/mercurial/hg-git/hggit
 
 prompt = /home/mbscholt/bin/hg/hg-prompt/prompt.py
+
+[git]
+authors = ~/.hgauthors.txt
+
+[tortoisehg]
+editor = geany
+tabwidth = 8
+shell = gnome-terminal
+
+[auth]
+sanoma.schemes = https
+sanoma.prefix = hg.sanomaservices.nl
+sanoma.username = m.scholten
+
+aqs.schemes = ssh
+aqs.prefix = aquariusoft.org
+aqs.username = Michiel Scholten <michiel@aquariusoft.org>