diff --git a/.gitconfig b/.gitconfig
index 13fe39c..25ce8d8 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,5 +1,4 @@
 [user]
-	email = johannes.loher@fg4f.de
 	name = Johannes Loher
 [core]
 	editor = vim
@@ -10,3 +9,5 @@
 	br = branch
 	hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
 	bclean = "!f() { git branch --merged ${1-master} | grep -v " ${1-master}$" | xargs -r git branch -d; }; f"
+[include]
+    path = .gitconfig.local
diff --git a/.gitconfig.local b/.gitconfig.local
new file mode 120000
index 0000000..69316af
--- /dev/null
+++ b/.gitconfig.local
@@ -0,0 +1 @@
+.gitconfig.local##hostname.avior
\ No newline at end of file
diff --git a/.gitconfig.local##default b/.gitconfig.local##default
new file mode 100644
index 0000000..f158cef
--- /dev/null
+++ b/.gitconfig.local##default
@@ -0,0 +1,2 @@
+[user]
+	email = johannes.loher@fg4f.de
diff --git a/.gitconfig.local##hostname.avior b/.gitconfig.local##hostname.avior
new file mode 100644
index 0000000..ce1550b
--- /dev/null
+++ b/.gitconfig.local##hostname.avior
@@ -0,0 +1,2 @@
+[user]
+	email = johannes.loher@tngtech.com