diff --git a/Makefile.am b/Makefile.am
index c13801d8..4e97269c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,20 +24,49 @@ MAINTAINERCLEANFILES = 		\
 	config.h.in		\
 	config.sub		\
 	depcomp			\
+	ABOUT-NLS		\
+	config.rpath		\
 	install-sh		\
 	ltmain.sh		\
 	omf.make		\
 	xmldocs.make		\
 	missing			\
 	mkinstalldirs		\
-	m4/gnome-doc-utils.m4	\
-	m4/gtk-doc.m4		\
-	m4/intltool.m4		\
-	m4/libtool.m4		\
-	m4/ltoptions.m4		\
-	m4/ltsugar.m4		\
-	m4/ltversion.m4		\
-	m4/lt~obsolete.m4	\
+	m4/codeset.m4 		\
+	m4/gettext.m4 		\
+	m4/glibc21.m4 		\
+	m4/glibc2.m4 		\
+	m4/iconv.m4 		\
+	m4/intdiv0.m4 		\
+	m4/intldir.m4 		\
+	m4/intl.m4 		\
+	m4/intlmacosx.m4 	\
+	m4/intltool.m4 		\
+	m4/intmax.m4 		\
+	m4/inttypes_h.m4 	\
+	m4/inttypes-pri.m4 	\
+	m4/lcmessage.m4 	\
+	m4/lib-ld.m4 		\
+	m4/lib-link.m4 		\
+	m4/lib-prefix.m4 	\
+	m4/libtool.m4 		\
+	m4/lock.m4 		\
+	m4/longlong.m4 		\
+	m4/lt~obsolete.m4 	\
+	m4/ltoptions.m4 	\
+	m4/ltsugar.m4 		\
+	m4/ltversion.m4 	\
+	m4/nls.m4 		\
+	m4/po.m4 		\
+	m4/printf-posix.m4 	\
+	m4/progtest.m4 		\
+	m4/size_max.m4 		\
+	m4/stdint_h.m4 		\
+	m4/uintmax_t.m4 	\
+	m4/visibility.m4 	\
+	m4/wchar_t.m4 		\
+	m4/wint_t.m4 		\
+	m4/xsize.m4 		\
 	po/missing		\
 	`find "$(srcdir)" -type f -name Makefile.in -print`
 
diff --git a/git.mk b/git.mk
index d88d4093..952c6998 100644
--- a/git.mk
+++ b/git.mk
@@ -108,6 +108,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
 		if test -f $(srcdir)/po/Makefile.in.in; then \
 			for x in \
 				po/Makefile.in.in \
+				po/Makefile.in.in~ \
 				po/Makefile.in \
 				po/Makefile \
 				po/POTFILES \
@@ -118,6 +119,11 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
 				intltool-extract.in \
 				intltool-merge.in \
 				intltool-update.in \
+				po/Makevars.template \
+				po/Rules-quot \
+				"po/*.header" \
+				"po/*.sin" \
+				"po/*.sed" \
 			; do echo /$$x; done; \
 		fi; \
 		if test -f $(srcdir)/configure; then \
@@ -130,6 +136,11 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
 				config.lt \
 			; do echo /$$x; done; \
 		fi; \
+		if test -d $(srcdir)/m4; then \
+			for x in \
+			"m4/*.m4" \
+			; do echo /$$x; done; \
+		fi; \
 		for x in \
 			.gitignore \
 			$(GITIGNOREFILES) \