diff --git a/.gitignore b/.gitignore
index c57456a1..f1063992 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,51 +1,51 @@
-*.pyc
-*.la
-*.lo
-*.loT
-*.o
-*.so
-*.bak
-*~
-tags
-TAGS
-Makefile.qmake
-Makefile
-Makefile.in
-.deps
-.libs
-ABOUT-NLS
-INSTALL
-aclocal.m4
-autom4te.cache
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config.rpath
-config.status
-config.sub
-configure
-depcomp
-gtk-doc.make
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
-py-compile
-ibus-*.tar.*
-ibus.spec
-ibus-1.0.pc
-xinput-ibus
-i386
-x86_64
-ChangeLog
-intltool-extract.in
-intltool-merge.in
-intltool-update.in
-mkinstalldirs
-.*
-rpm
-stamp-h2
-memconf.xml.in
+/*.bak
+/*.lo
+/*.o
+/*.orig
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.gitignore
+/.libs
+/ChangeLog
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/ID
+/Makefile
+/Makefile.in
+/TAGS
+/_libs
+/autom4te.cache
+/config.cache
+/config.h
+/config.log
+/config.lt
+/config.status
+/config.status.lineno
+/configure
+/configure.lineno
+/ibus-*.tar.*
+/ibus-1.0.pc
+/ibus.spec
+/intltool-extract.in
+/intltool-merge.in
+/intltool-update.in
+/libtool
+/po/*.gmo
+/po/*.mo
+/po/.intltool-merge-cache
+/po/Makefile
+/po/Makefile.in
+/po/Makefile.in.in
+/po/POTFILES
+/po/ibus10.pot
+/po/stamp-it
+/ppa
+/so_locations
+/stamp-h1
+/tags
+/xinput-ibus
diff --git a/Makefile.am b/Makefile.am
index 02b71638..29c57e1a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -166,3 +166,5 @@ git-tag:
 
 git-clean-tree:
 	git clean -d -f -x
+
+-include $(top_srcdir)/git.mk
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 6e5bb6e5..135849c7 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -27,3 +27,5 @@ endif
 SUBDIRS = \
 	$(VALA_DIR) \
 	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index a7a128bb..004b7fc0 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -35,3 +35,5 @@ ibus-@IBUS_API_VERSION@.vapi:
 
 generate-vala:
 	vala-gen-introspect ibus-@IBUS_API_VERSION@ ibus-@IBUS_API_VERSION@
+
+-include $(top_srcdir)/git.mk
diff --git a/bus/.gitignore b/bus/.gitignore
index 3ab656f4..dc384553 100644
--- a/bus/.gitignore
+++ b/bus/.gitignore
@@ -1,4 +1,26 @@
-ibus-daemon
-test-matchrule
-ibus.desktop
-marshalers.[ch]
+/*.bak
+/*.lo
+/*.o
+/*.orig
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.gitignore
+/.libs
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/ID
+/Makefile
+/Makefile.in
+/TAGS
+/_libs
+/ibus-daemon
+/ibus.desktop
+/marshalers.c
+/marshalers.h
+/so_locations
+/tags
diff --git a/bus/Makefile.am b/bus/Makefile.am
index e3790dc7..074b456d 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -160,3 +160,5 @@ test: ibus-daemon
 	$(ENV_IBUS_TEST) \
 		G_DEBUG=fatal_warnings \
 		$(builddir)/ibus-daemon -v
+
+-include $(top_srcdir)/git.mk
diff --git a/client/Makefile.am b/client/Makefile.am
index fa3cee6c..53561024 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -37,3 +37,5 @@ SUBDIRS = \
 	$(GTK3) \
 	$(X11) \
 	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/client/gtk2/Makefile.am b/client/gtk2/Makefile.am
index 730cdbe3..471a11c6 100644
--- a/client/gtk2/Makefile.am
+++ b/client/gtk2/Makefile.am
@@ -62,3 +62,5 @@ EXTRA_DIST = \
 
 test: all
 	GTK_IM_MODULE=ibus gedit
+
+-include $(top_srcdir)/git.mk
diff --git a/client/gtk3/Makefile.am b/client/gtk3/Makefile.am
index 9f297aab..45056224 100644
--- a/client/gtk3/Makefile.am
+++ b/client/gtk3/Makefile.am
@@ -62,3 +62,5 @@ EXTRA_DIST = \
 
 test: all
 	GTK_IM_MODULE=ibus gedit
+
+-include $(top_srcdir)/git.mk
diff --git a/client/x11/.gitignore b/client/x11/.gitignore
index bdff9a1f..d92e9429 100644
--- a/client/x11/.gitignore
+++ b/client/x11/.gitignore
@@ -1 +1,23 @@
-ibus-x11
+/*.bak
+/*.lo
+/*.o
+/*.orig
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.gitignore
+/.libs
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/ID
+/Makefile
+/Makefile.in
+/TAGS
+/_libs
+/ibus-x11
+/so_locations
+/tags
diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am
index 5b398b37..91d97ddc 100644
--- a/client/x11/Makefile.am
+++ b/client/x11/Makefile.am
@@ -70,3 +70,5 @@ locales.h:
 		uniq | sort | \
 		xargs python -c 'import sys;print "#define LOCALES_STRING \"%s\"" % ",".join(sys.argv[1:])' \
 	 ) > $@
+
+-include $(top_srcdir)/git.mk
diff --git a/data/.gitignore b/data/.gitignore
index 461264b0..300eb0a5 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -1 +1,23 @@
-ibus.schemas
+/*.bak
+/*.lo
+/*.o
+/*.orig
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.gitignore
+/.libs
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/ID
+/Makefile
+/Makefile.in
+/TAGS
+/_libs
+/ibus.schemas
+/so_locations
+/tags
diff --git a/data/Makefile.am b/data/Makefile.am
index 4ea669d6..ba9f4bbb 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -47,3 +47,5 @@ EXTRA_DIST = \
 DISTCLEANFILES = \
 	$(schemas_DATA) \
 	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 1d405a6e..c1862a19 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -72,3 +72,5 @@ EXTRA_DIST = \
 	$(hicolor_icon_48_DATA) \
 	$(hicolor_icon_scalable_DATA) \
 	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/keymaps/Makefile.am b/data/keymaps/Makefile.am
index c21be4d9..e9fab319 100644
--- a/data/keymaps/Makefile.am
+++ b/data/keymaps/Makefile.am
@@ -72,3 +72,5 @@ keymapsdir = $(pkgdatadir)/keymaps
 EXTRA_DIST = \
 	$(keymaps) \
 	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 00000000..bdb69702
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,2 @@
+/changelog
+/.gitignore
diff --git a/docs/.gitignore b/docs/.gitignore
index c4ba32c3..2e54566d 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1 +1,22 @@
-trim-build.stamp
+/*.bak
+/*.lo
+/*.o
+/*.orig
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.gitignore
+/.libs
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/ID
+/Makefile
+/Makefile.in
+/TAGS
+/_libs
+/so_locations
+/tags
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 71ed9531..962d37dd 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -23,3 +23,5 @@
 SUBDIRS = 		\
 	reference 	\
 	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 95f49731..050c78d2 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -23,3 +23,5 @@
 SUBDIRS = 	\
 	ibus 	\
 	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/docs/reference/ibus/.gitignore b/docs/reference/ibus/.gitignore
index e5c6e9d4..070c9e5a 100644
--- a/docs/reference/ibus/.gitignore
+++ b/docs/reference/ibus/.gitignore
@@ -1,23 +1,50 @@
-ibus-decl-list.txt
-ibus-decl.txt
-ibus-overrides.txt
-ibus-undeclared.txt
-ibus-undocumented.txt
-ibus-unused.txt
-ibus-sections.txt.old
-html
-tmpl
-xml
-html-build.stamp
-html.stamp
-ibus.args
-ibus.hierarchy
-ibus.interfaces
-ibus.prerequisites
-ibus.signals
-scan-build.stamp
-sgml-build.stamp
-sgml.stamp
-tmpl-build.stamp
-tmpl.stamp
-
+/*.bak
+/*.lo
+/*.o
+/*.orig
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.gitignore
+/.libs
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/ID
+/Makefile
+/Makefile.in
+/TAGS
+/_libs
+/html
+/html-build.stamp
+/html.stamp
+/ibus-decl-list.txt
+/ibus-decl.txt
+/ibus-docs.sgml
+/ibus-sections.txt
+/ibus-undeclared.txt
+/ibus-undocumented.txt
+/ibus-unused.txt
+/ibus.args
+/ibus.hierarchy
+/ibus.interfaces
+/ibus.prerequisites
+/ibus.signals
+/pdf-build.stamp
+/pdf.stamp
+/scan-build.stamp
+/setup-build.stamp
+/setup.stamp
+/sgml-build.stamp
+/sgml.stamp
+/so_locations
+/tags
+/tmpl-build.stamp
+/tmpl.stamp
+/tmpl/*.bak
+/tmpl/ibus-unused.sgml
+/trim-build.stamp
+/xml
diff --git a/docs/reference/ibus/Makefile.am b/docs/reference/ibus/Makefile.am
index d50f86e2..41602ec2 100644
--- a/docs/reference/ibus/Makefile.am
+++ b/docs/reference/ibus/Makefile.am
@@ -127,3 +127,5 @@ tmpl-build.stamp: trim-build.stamp  $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DO
 
 CLEANFILES+= *.stamp
 
+
+-include $(top_srcdir)/git.mk
diff --git a/gconf/.gitignore b/gconf/.gitignore
index d8adae8e..c9462f96 100644
--- a/gconf/.gitignore
+++ b/gconf/.gitignore
@@ -1,3 +1,26 @@
-ibus-gconf
-gconf.xml
-gconf.xml.in
+/*.bak
+/*.lo
+/*.o
+/*.orig
+/*.pyc
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.gitignore
+/.libs
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/ID
+/Makefile
+/Makefile.in
+/TAGS
+/_libs
+/gconf.xml
+/gconf.xml.in
+/ibus-gconf
+/so_locations
+/tags
diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index 16436832..cf74a4ab 100644
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -75,3 +75,5 @@ gconf.xml: gconf.xml.in
 
 $(libibus):
 	$(MAKE) -C $(top_builddir)/src
+
+-include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
new file mode 100644
index 00000000..5ab41bab
--- /dev/null
+++ b/git.mk
@@ -0,0 +1,187 @@
+# git.mk
+#
+# Copyright 2009, Red Hat, Inc.
+# Written by Behdad Esfahbod
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+#
+# The canonical source for this file is pango/git.mk, or whereever the
+# header of pango/git.mk suggests in the future.
+#
+# To use in your project, import this file in your git repo's toplevel,
+# then do "make -f git.mk".  This modifies all Makefile.am files in
+# your project to include git.mk.
+#
+# This enables automatic .gitignore generation.  If you need to ignore
+# more files, add them to the GITIGNOREFILES variable in your Makefile.am.
+# But think twice before doing that.  If a file has to be in .gitignore,
+# chances are very high that it's a generated file and should be in one
+# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES.
+#
+# The only case that you need to manually add a file to GITIGNOREFILES is
+# when remove files in one of mostlyclean-local, clean-local, distclean-local,
+# or maintainer-clean-local.
+#
+# Note that for files like editor backup, etc, there are better places to
+# ignore them.  See "man gitignore".
+#
+# If "make maintainer-clean" removes the files but they are not recognized
+# by this script (that is, if "git status" shows untracked files still), send
+# me the output of "git status" as well as your Makefile.am and Makefile for
+# the directories involved.
+#
+# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
+# pango/Makefile.am.
+#
+# Don't EXTRA_DIST this file.  It is supposed to only live in git clones,
+# not tarballs.  It serves no useful purpose in tarballs and clutters the
+# build dir.
+#
+# This file knows how to handle autoconf, automake, libtool, gtk-doc,
+# gnome-doc-utils, intltool.
+#
+#
+# KNOWN ISSUES:
+#
+# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the
+#   submodule doesn't find us.  If you have configure.{in,ac} files in
+#   subdirs, add a proxy git.mk file in those dirs that simply does:
+#   "include $(top_srcdir)/../git.mk".  Add more ..'s to your taste.
+#   And add those files to git.  See vte/gnome-pty-helper/git.mk for
+#   example.
+#
+
+git-all: git-mk-install
+
+git-mk-install:
+	@echo Installing git makefile
+	@any_failed=; find $(top_srcdir) -name Makefile.am | while read x; do \
+		if grep 'include .*/git.mk' $$x >/dev/null; then \
+			echo $$x already includes git.mk; \
+		else \
+			failed=; \
+			echo "Updating $$x"; \
+			{ cat $$x; \
+			  echo ''; \
+			  echo '-include $$(top_srcdir)/git.mk'; \
+			} > $$x.tmp || failed=1; \
+			if test x$$failed = x; then \
+				mv $$x.tmp $$x || failed=1; \
+			fi; \
+			if test x$$failed = x; then : else \
+				echo Failed updating $$x; >&2 \
+				any_failed=1; \
+			fi; \
+	fi; done; test -z "$$any_failed"
+
+.PHONY: git-all git-mk-install
+
+
+### .gitignore generation
+
+$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
+	$(AM_V_GEN) \
+	{ \
+		if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
+			for x in \
+				$(DOC_MODULE)-decl-list.txt \
+				$(DOC_MODULE)-decl.txt \
+				tmpl/$(DOC_MODULE)-unused.sgml \
+				"tmpl/*.bak" \
+				xml html \
+			; do echo /$$x; done; \
+		fi; \
+		if test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
+			for x in \
+				$(_DOC_C_DOCS) \
+				$(_DOC_LC_DOCS) \
+				$(_DOC_OMF_ALL) \
+				$(_DOC_DSK_ALL) \
+				$(_DOC_HTML_ALL) \
+				$(_DOC_POFILES) \
+				"*/.xml2po.mo" \
+				"*/*.omf.out" \
+			; do echo /$$x; done; \
+		fi; \
+		if test -f $(srcdir)/po/Makefile.in.in; then \
+			for x in \
+				po/Makefile.in.in \
+				po/Makefile.in \
+				po/Makefile \
+				po/POTFILES \
+				po/stamp-it \
+				po/.intltool-merge-cache \
+				"po/*.gmo" \
+				"po/*.mo" \
+				po/$(GETTEXT_PACKAGE).pot \
+				intltool-extract.in \
+				intltool-merge.in \
+				intltool-update.in \
+			; do echo /$$x; done; \
+		fi; \
+		if test -f $(srcdir)/configure; then \
+			for x in \
+				autom4te.cache \
+				configure \
+				config.h \
+				stamp-h1 \
+				libtool \
+				config.lt \
+			; do echo /$$x; done; \
+		fi; \
+		for x in \
+			.gitignore \
+			$(GITIGNOREFILES) \
+			$(CLEANFILES) \
+			$(PROGRAMS) \
+			$(check_PROGRAMS) \
+			$(EXTRA_PROGRAMS) \
+			$(LTLIBRARIES) \
+			so_locations \
+			.libs _libs \
+			$(MOSTLYCLEANFILES) \
+			"*.$(OBJEXT)" \
+			"*.lo" \
+			$(DISTCLEANFILES) \
+			$(am__CONFIG_DISTCLEAN_FILES) \
+			$(CONFIG_CLEAN_FILES) \
+			TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
+			"*.tab.c" \
+			$(MAINTAINERCLEANFILES) \
+			$(BUILT_SOURCES) \
+			$(DEPDIR) \
+			Makefile \
+			Makefile.in \
+			"*.orig" \
+			"*.rej" \
+			"*.bak" \
+			"*~" \
+			".*.sw[nop]" \
+		; do echo /$$x; done; \
+	} | \
+	sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
+	sed 's@/[.]/@/@g' | \
+	LC_ALL=C sort | uniq > $@.tmp && \
+	mv $@.tmp $@;
+
+all: $(srcdir)/.gitignore gitignore-recurse-maybe
+gitignore-recurse-maybe:
+	@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
+		$(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
+	fi;
+gitignore-recurse:
+	@for subdir in $(DIST_SUBDIRS); do \
+	  case " $(SUBDIRS) " in \
+	    *" $$subdir "*) :;; \
+	    *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
+	  esac; \
+	done
+gitignore: $(srcdir)/.gitignore gitignore-recurse
+
+maintainer-clean: gitignore-clean
+gitignore-clean:
+	-rm -f $(srcdir)/.gitignore
+
+.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
diff --git a/ibus/.gitignore b/ibus/.gitignore
index 56b6ff10..4d9845eb 100644
--- a/ibus/.gitignore
+++ b/ibus/.gitignore
@@ -1 +1,24 @@
-_config.py
+/*.bak
+/*.lo
+/*.o
+/*.orig
+/*.pyc
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.gitignore
+/.libs
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/ID
+/Makefile
+/Makefile.in
+/TAGS
+/_config.py
+/_libs
+/so_locations
+/tags
diff --git a/ibus/Makefile.am b/ibus/Makefile.am
index d1cd750d..c71df1b7 100644
--- a/ibus/Makefile.am
+++ b/ibus/Makefile.am
@@ -69,3 +69,5 @@ CLEANFILES = \
 DISTCLEANFILES = \
 	_config.py \
 	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/ibus/interface/Makefile.am b/ibus/interface/Makefile.am
index 49871ed2..2d9ae422 100644
--- a/ibus/interface/Makefile.am
+++ b/ibus/interface/Makefile.am
@@ -37,3 +37,5 @@ CLEANFILES = \
 	*.pyc \
 	$(NULL)
 
+
+-include $(top_srcdir)/git.mk
diff --git a/m4/.gitignore b/m4/.gitignore
index 0f4126cd..67ef4e3d 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1 +1,29 @@
-*.m4
+/*.bak
+/*.lo
+/*.o
+/*.orig
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.gitignore
+/.libs
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/ID
+/Makefile
+/Makefile.in
+/TAGS
+/_libs
+/so_locations
+/tags
+/gtk-doc.m4
+/intltool.m4
+/libtool.m4
+/ltoptions.m4
+/ltsugar.m4
+/ltversion.m4
+/lt~obsolete.m4
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 7c74bf44..cdbe5178 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -23,3 +23,5 @@
 EXTRA_DIST = \
     as-version.m4 \
     $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/memconf/Makefile.am b/memconf/Makefile.am
index 758348ea..f5f5c082 100644
--- a/memconf/Makefile.am
+++ b/memconf/Makefile.am
@@ -72,3 +72,5 @@ memconf.xml: memconf.xml.in
 
 $(libibus):
 	$(MAKE) -C $(top_builddir)/src
+
+-include $(top_srcdir)/git.mk
diff --git a/po/.gitignore b/po/.gitignore
index 88df1dac..abc89982 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -15,3 +15,4 @@ remove-potcdate.sin
 stamp-po
 stamp-it
 ibus.pot
+/*~
diff --git a/setup/.gitignore b/setup/.gitignore
index 1a6aff2f..323670c9 100644
--- a/setup/.gitignore
+++ b/setup/.gitignore
@@ -1,2 +1,25 @@
-ibus-setup
-ibus-setup.desktop
+/*.bak
+/*.lo
+/*.o
+/*.orig
+/*.pyc
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.gitignore
+/.libs
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/ID
+/Makefile
+/Makefile.in
+/TAGS
+/_libs
+/ibus-setup
+/ibus-setup.desktop
+/so_locations
+/tags
diff --git a/setup/Makefile.am b/setup/Makefile.am
index 1730ec07..9618d7fa 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -64,3 +64,5 @@ test:
 		IBUS_LOCALEDIR="@localedir@" \
 		$(PYTHON) \
 		$(srcdir)/main.py
+
+-include $(top_srcdir)/git.mk
diff --git a/src/.gitignore b/src/.gitignore
index 4c91b3a9..fd5e1a29 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,17 +1,33 @@
-ibusmarshalers.c
-ibusmarshalers.h
-test-attribute
-test-bus
-test-engine
-test-keynames
-test-lookuptable
-test-proxy
-test-server
-test-text
-test-keymap
-stamp-ibusenumtypes.h
-stamp-ibusmarshalers.h
-keysymdef.h
-ibusenumtypes.c
-ibusenumtypes.h
-ibusversion.h
+/*.bak
+/*.la
+/*.lo
+/*.o
+/*.orig
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.gitignore
+/.libs
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/IBus-1.0.gir
+/IBus-1.0.typelib
+/ID
+/Makefile
+/Makefile.in
+/TAGS
+/_libs
+/ibusenumtypes.c
+/ibusenumtypes.h
+/ibusmarshalers.c
+/ibusmarshalers.h
+/ibusversion.h
+/libibus-1.0.la
+/so_locations
+/stamp-ibusenumtypes.h
+/stamp-ibusmarshalers.h
+/tags
diff --git a/src/Makefile.am b/src/Makefile.am
index 08152a79..4ab59907 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -220,3 +220,5 @@ CLEANFILES +=                   \
 DISTCLEANFILES =                \
     ibusversion.h               \
     $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/tests/.gitignore b/src/tests/.gitignore
index aa4a4f57..11362388 100644
--- a/src/tests/.gitignore
+++ b/src/tests/.gitignore
@@ -1,6 +1,28 @@
-ibus-bus
-ibus-configservice
-ibus-factory
-ibus-keynames
-ibus-serializable
-ibus-share
+/*.bak
+/*.lo
+/*.o
+/*.orig
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.gitignore
+/.libs
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/ID
+/Makefile
+/Makefile.in
+/TAGS
+/_libs
+/ibus-bus
+/ibus-configservice
+/ibus-factory
+/ibus-keynames
+/ibus-serializable
+/ibus-share
+/so_locations
+/tags
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index df173a03..16d9924d 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -63,3 +63,5 @@ ibus_factory_LDADD = $(prog_ldadd)
 
 ibus_configservice_SOURCES = ibus-configservice.c
 ibus_configservice_LDADD = $(prog_ldadd)
+
+-include $(top_srcdir)/git.mk
diff --git a/ui/Makefile.am b/ui/Makefile.am
index a0e287e7..ba6d4ffb 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -25,3 +25,5 @@ SUBDIRS = \
 	gtk \
 	$(NULL)
 endif
+
+-include $(top_srcdir)/git.mk
diff --git a/ui/gtk/.gitignore b/ui/gtk/.gitignore
index 2dc266a9..ae616499 100644
--- a/ui/gtk/.gitignore
+++ b/ui/gtk/.gitignore
@@ -1,3 +1,26 @@
-ibus-ui-gtk
-gtkpanel.xml
-gtkpanel.xml.in
+/*.bak
+/*.lo
+/*.o
+/*.orig
+/*.pyc
+/*.rej
+/*.tab.c
+/*~
+/.*.sw[nop]
+/.deps
+/.gitignore
+/.libs
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/ID
+/Makefile
+/Makefile.in
+/TAGS
+/_libs
+/gtkpanel.xml
+/gtkpanel.xml.in
+/ibus-ui-gtk
+/so_locations
+/tags
diff --git a/ui/gtk/Makefile.am b/ui/gtk/Makefile.am
index 38f9ed12..a807095e 100644
--- a/ui/gtk/Makefile.am
+++ b/ui/gtk/Makefile.am
@@ -70,3 +70,5 @@ test:
 		IBUS_LOCALEDIR=@localedir@ \
 		PYTHONPATH=$(top_srcdir) \
 		$(PYTHON) $(srcdir)/main.py
+
+-include $(top_srcdir)/git.mk
diff --git a/util/IMdkit/Makefile.am b/util/IMdkit/Makefile.am
index ddee4d02..f07f5aae 100644
--- a/util/IMdkit/Makefile.am
+++ b/util/IMdkit/Makefile.am
@@ -50,3 +50,5 @@ noinst_HEADERS = \
 libIMdkit_la_CFLAGS = \
 	@X11_CFLAGS@ \
 	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/util/Makefile.am b/util/Makefile.am
index 604d328f..b41bc910 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -25,3 +25,5 @@ SUBDIRS = \
 	IMdkit \
 	$(NULL)
 endif
+
+-include $(top_srcdir)/git.mk