diff --git a/configure.ac b/configure.ac
index c7c45324f9dcaeab856274721f63335f86bcd89e..0ae0010b3a1e995ce801b9e7061110ff74012ddb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 AC_PREREQ(2.59)
 AC_INIT(ganeti, 1.2b2, ganeti@googlegroups.com)
 AC_CONFIG_AUX_DIR(autotools)
-AM_INIT_AUTOMAKE([foreign tar-ustar dist-bzip2])
+AM_INIT_AUTOMAKE([foreign tar-ustar])
 
 # Check common programs
 AC_PROG_INSTALL
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3270b78776669f6e1438c923f60ac9c525b10c2d..4aedb150135d0a5ab575d3a1334622557d55f585 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,9 +1,12 @@
 docdir = $(datadir)/doc/$(PACKAGE)
 
 SUBDIRS = examples
-dist_doc_DATA = hooks.html hooks.pdf install.html install.pdf admin.html \
-  admin.pdf
+dist_doc_DATA = \
+  hooks.html hooks.pdf \
+  install.html install.pdf \
+  admin.html admin.pdf
 EXTRA_DIST = hooks.sgml install.sgml admin.sgml
+MAINTAINERCLEANFILES = *.html *.pdf
 
 %.html: %.sgml
 	docbook2html --nochunks $<
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 667567de93d5404c902d5266ef2ac57e3f6ffdd5..f26adeef6a5d441bbf398ddee0c9e254d27e20e7 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -1,8 +1,9 @@
-nodist_bin_SCRIPTS = ganeti.initd
-
 EXTRA_DIST = ganeti.initd.in ganeti.cron
 CLEANFILES = $(nodist_bin_SCRIPTS)
 
+nodist_bin_SCRIPTS = ganeti.initd
+
+all-local: ganeti.initd
 ganeti.initd: ganeti.initd.in
 	sed \
 	  -e "s#@PREFIX@#$(prefix)#g" \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 48e90e8c4079365786d1d2a839a5ad3bf2b17e22..c32cf6eeb1386a4fa90cbae9b7729fc20c365cdf 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,10 +1,13 @@
-MAINTAINERCLEANFILES = _autoconf.py
+CLEANFILES = $(nodist_pkgpython_PYTHON) *.py[oc]
+
 nodist_pkgpython_PYTHON = _autoconf.py
 pkgpython_PYTHON = __init__.py backend.py cli.py cmdlib.py config.py \
 	objects.py errors.py logger.py ssh.py utils.py rpc.py \
 	bdev.py hypervisor.py opcodes.py mcpu.py constants.py \
 	ssconf.py
 
+all-local: _autoconf.py
+
 _autoconf.py: Makefile
 	{ echo '# This file is automatically generated, do not edit!'; \
 	  echo "PACKAGE_VERSION = '$(PACKAGE_VERSION)'"; \
diff --git a/man/Makefile.am b/man/Makefile.am
index 552ae2de0ff886e3cd78b0bda83627d24725a337..4b6a410b9026d5733eb42fd604ada71ff5667887 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -7,6 +7,7 @@ EXTRA_DIST = ganeti-os-interface.sgml gnt-cluster.sgml gnt-node.sgml \
 	     ganeti-watcher.sgml ganeti.sgml gnt-instance.sgml gnt-os.sgml \
 	     gnt-backup.sgml ganeti-noded.sgml \
 	     footer.sgml $(man_MANS)
+MAINTAINERCLEANFILES = *.[78]
 
 %.7 %.8: %.sgml footer.sgml
 	docbook2man $<
diff --git a/testing/Makefile.am b/testing/Makefile.am
index 732c182f5447a0c5964feae1435b05630f59ff65..9fb5f7e449b994a31c89377db85fbcad6da01671 100644
--- a/testing/Makefile.am
+++ b/testing/Makefile.am
@@ -7,3 +7,4 @@ ganeti:
 	ln -s $(top_srcdir)/lib ganeti
 
 EXTRA_DIST = $(TESTS) mocks.py ganeti.qa.py qa-sample.yaml
+MAINTAINERCLEANFILES = ganeti