diff --git a/Makefile b/Makefile
index 7fc7a88..8405ec0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-FILES = ratpoisonrc vimrc Xresources zshrc emacs.el \
+FILES = ratpoisonrc vimrc Xresources zshrc emacs.el gitconfig \
 	bashrc bash_completion screenrc commonshrc gnomerc gvimrc
 
 ifeq "$(USER)" "gebner"
diff --git a/gitconfig b/gitconfig
new file mode 100644
index 0000000..8acb564
--- /dev/null
+++ b/gitconfig
@@ -0,0 +1,8 @@
+[user]
+	email = gebner@2b7e.org
+	name = Gabriel Ebner
+[github]
+	user = gebner
+[color]
+	interactive = auto
+	diff = auto