--- builtin/init-db.c
+++ builtin/init-db.c
@@ -9,7 +9,7 @@
 #include "parse-options.h"
 
 #ifndef DEFAULT_GIT_TEMPLATE_DIR
-#define DEFAULT_GIT_TEMPLATE_DIR "/usr/share/git-core/templates"
+#define DEFAULT_GIT_TEMPLATE_DIR "/usr/lib/git-core/templates"
 #endif
 
 #ifdef NO_TRUSTABLE_FILEMODE
--- config.mak.in
+++ config.mak.in
@@ -16,7 +16,7 @@
 bindir = @bindir@
 gitexecdir = @libexecdir@/git-core
 datarootdir = @datarootdir@
-template_dir = @datadir@/git-core/templates
+template_dir = @libexecdir@/git-core/templates
 sysconfdir = @sysconfdir@
 docdir = @docdir@
 
--- templates/Makefile
+++ templates/Makefile
@@ -8,7 +8,7 @@
 TAR ?= tar
 RM ?= rm -f
 prefix ?= $(HOME)
-template_instdir ?= $(prefix)/share/git-core/templates
+template_instdir ?= $(prefix)/lib/git-core/templates
 # DESTDIR=
 
 ifndef SHELL_PATH