5 files changed, 20 insertions, 22 deletions
diff --git a/doc/.gitignore b/doc/.gitignore
deleted file mode 100644
index 6d049dc..0000000
--- a/doc/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-*.args
-*.hierarchy
-*.interfaces
-*.prerequisites
-*.signals
-*.types
-*.stamp
-html
-*.7
-*.8
-*.1
-tmpl
-version.xml
-xml
-.libs
-
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 79695b8..9a27a58 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -74,9 +74,17 @@ FIXXREF_OPTIONS=
 MAINTAINERCLEANFILES =		\
 	*~			\
 	Makefile.in		\
-	upower.types	\
-	upower-*.txt	\
-	$(NULL)
+	UPower.types		\
+	UPower-*.txt
+
+DISTCLEANFILES =					\
+	org.freedesktop.UPower.Device.ref.xml		\
+	org.freedesktop.UPower.KbdBacklight.ref.xml	\
+	org.freedesktop.UPower.QoS.ref.xml		\
+	org.freedesktop.UPower.ref.xml			\
+	upowerd.xml					\
+	upower.xml					\
+	UPower.xml
 
 if ENABLE_GTK_DOC
 include $(top_srcdir)/gtk-doc.make
@@ -87,3 +95,4 @@ endif
 # Version information for marking the documentation
 EXTRA_DIST += version.xml.in
 
+-include $(top_srcdir)/git.mk
diff --git a/doc/dbus/.gitignore b/doc/dbus/.gitignore
deleted file mode 100644
index 7879383..0000000
--- a/doc/dbus/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.ref.xml
-*.ref.xml
-
diff --git a/doc/dbus/Makefile.am b/doc/dbus/Makefile.am
index 5275f16..2061cb9 100644
--- a/doc/dbus/Makefile.am
+++ b/doc/dbus/Makefile.am
@@ -23,5 +23,9 @@ org.freedesktop.UPower.Wakeups.ref.xml : $(top_srcdir)/src/org.freedesktop.UPowe
 
 EXTRA_DIST = spec-to-docbook.xsl dbus-introspect-docs.dtd
 
+MAINTAINERCLEANFILES = *.ref.xml
+
 clean-local :
 	rm -f *~ *.ref.xml
+
+-include $(top_srcdir)/git.mk
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 6a7489f..cb3dedc 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -8,6 +8,8 @@ man_MANS = 				\
 %.1 %.7 %.8 : %.xml
 	$(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
+MAINTAINERCLEANFILES = $(man_MANS)
+
 endif # MAN_PAGES_ENABLED
 
 EXTRA_DIST= 				\
@@ -17,3 +19,5 @@ EXTRA_DIST= 				\
 
 clean-local:
 	rm -f *~ *.[178]
+
+-include $(top_srcdir)/git.mk