diff --git a/.gitconfig b/.gitconfig
index 64fd937..9252fc5 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -9,5 +9,6 @@
     ignore = "!gi() { curl -L -s https://www.gitignore.io/api/$@ ; } ; gi"
 [commit]
 	gpgsign = true
+    template = ~/.gitmessage
 [core]
 	autocrlf = input
diff --git a/.gitmessage b/.gitmessage
new file mode 100644
index 0000000..fd3be40
--- /dev/null
+++ b/.gitmessage
@@ -0,0 +1,3 @@
+
+
+Signed-off-by: Tobias Manske <tobias.manske@mailbox.org>
diff --git a/Makefile b/Makefile
index 0807ff4..376b6bc 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,9 @@ vim:
 
 git:
 	rm ~/.gitconfig || echo
+	rm ~/.gitmessage || echo
 	ln -s ~/.dotfiles/.gitconfig ~/.gitconfig
+	ln -s ~/.dotfiles/.gitmessage ~/.gitmessage
 
 xresources:
 	rm ~/.Xresources