diff --git a/.bin/maketags b/.bin/maketags
index dd40db5..6b8149a 100755
--- a/.bin/maketags
+++ b/.bin/maketags
@@ -12,6 +12,7 @@ find "${PWD}/"* -type f \
             -o -iname "*.hh" \
             -o -iname "*.hpp" \
             -o -iname "*.lua" \
+            -o -iname "*.java" \
             -o -iname "*.gmk" \
             -o -iname "*.pl" \
             -o -iname "*.sh" \
@@ -42,9 +43,10 @@ cscope -qbkCRv -P${PWD} -f ${PWD}/.git/cscope.out -i${PWD}/.git/files
 
 # create tags file
 ectags --sort=yes \
-       --languages=C,C++,Make,Lua,Perl,Sh \
+       --languages=C,C++,Make,Lua,Perl,Sh,Java \
        --tag-relative=no \
        --extra=fq \
+       --fields=+K \
        --totals=yes \
        --fields=fkst \
        --exclude=.git \
diff --git a/.gitconfig b/.gitconfig
index 68cd761..0a86df4 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -4,6 +4,9 @@
 [user "git@github.wdf.sap.corp:"]
 	name = Stefan Hagen
 	email = stefan.hagen@sap.com
+[user "github.wdf.sap.corp"]
+	name = Stefan Hagen
+	email = stefan.hagen@sap.com
 [user "git@github.infra.hana.ondemand.com:"]
 	name = Stefan Hagen
 	email = stefan.hagen@sap.com