diff --git a/Makefile b/Makefile
index ca2ecbc75..0461144ac 100644
--- a/Makefile
+++ b/Makefile
@@ -181,3 +181,4 @@ maintainer-clean: clean
 	rm -fr rpmbuild dist
 	cd ipa-server && $(MAKE) maintainer-clean
 	cd ipa-client && $(MAKE) maintainer-clean
+	cd ipa-python && $(MAKE) maintainer-clean
diff --git a/ipa-python/Makefile b/ipa-python/Makefile
index 525875377..bad5ca5c8 100644
--- a/ipa-python/Makefile
+++ b/ipa-python/Makefile
@@ -17,6 +17,9 @@ clean:
 
 distclean: clean
 
+maintainer-clean: distclean
+	rm -rf build
+
 .PHONY: test
 test: $(subst .py,.tst,$(TESTS))
 
diff --git a/ipa-server/ipa-gui/ipagui/Makefile.am b/ipa-server/ipa-gui/ipagui/Makefile.am
index 683235678..83636323d 100644
--- a/ipa-server/ipa-gui/ipagui/Makefile.am
+++ b/ipa-server/ipa-gui/ipagui/Makefile.am
@@ -26,4 +26,5 @@ EXTRA_DIST =			\
 
 MAINTAINERCLEANFILES =		\
 	*~			\
+	*.pyc			\
 	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/config/Makefile.am b/ipa-server/ipa-gui/ipagui/config/Makefile.am
index 5d5492841..db96758f3 100644
--- a/ipa-server/ipa-gui/ipagui/config/Makefile.am
+++ b/ipa-server/ipa-gui/ipagui/config/Makefile.am
@@ -16,4 +16,5 @@ EXTRA_DIST =			\
 
 MAINTAINERCLEANFILES =		\
 	*~			\
+	*.pyc			\
 	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/forms/Makefile.am b/ipa-server/ipa-gui/ipagui/forms/Makefile.am
index c075b9f47..4f1f72d22 100644
--- a/ipa-server/ipa-gui/ipagui/forms/Makefile.am
+++ b/ipa-server/ipa-gui/ipagui/forms/Makefile.am
@@ -14,4 +14,5 @@ EXTRA_DIST =			\
 
 MAINTAINERCLEANFILES =		\
 	*~			\
+	*.pyc			\
 	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/helpers/Makefile.am b/ipa-server/ipa-gui/ipagui/helpers/Makefile.am
index 490c8e4f1..aa3e75bf0 100644
--- a/ipa-server/ipa-gui/ipagui/helpers/Makefile.am
+++ b/ipa-server/ipa-gui/ipagui/helpers/Makefile.am
@@ -12,4 +12,5 @@ EXTRA_DIST =			\
 
 MAINTAINERCLEANFILES =		\
 	*~			\
+	*.pyc			\
 	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/static/Makefile.am b/ipa-server/ipa-gui/ipagui/static/Makefile.am
index 11c213841..d4ca45572 100644
--- a/ipa-server/ipa-gui/ipagui/static/Makefile.am
+++ b/ipa-server/ipa-gui/ipagui/static/Makefile.am
@@ -8,4 +8,5 @@ SUBDIRS =			\
 
 MAINTAINERCLEANFILES =		\
 	*~			\
+	*.pyc			\
 	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/static/css/Makefile.am b/ipa-server/ipa-gui/ipagui/static/css/Makefile.am
index 482893466..fe8a39791 100644
--- a/ipa-server/ipa-gui/ipagui/static/css/Makefile.am
+++ b/ipa-server/ipa-gui/ipagui/static/css/Makefile.am
@@ -11,4 +11,5 @@ EXTRA_DIST =			\
 
 MAINTAINERCLEANFILES =		\
 	*~			\
+	*.pyc			\
 	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/static/images/Makefile.am b/ipa-server/ipa-gui/ipagui/static/images/Makefile.am
index d1f919848..011e24aec 100644
--- a/ipa-server/ipa-gui/ipagui/static/images/Makefile.am
+++ b/ipa-server/ipa-gui/ipagui/static/images/Makefile.am
@@ -24,4 +24,5 @@ EXTRA_DIST =			\
 
 MAINTAINERCLEANFILES =		\
 	*~			\
+	*.pyc			\
 	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/static/images/branding/Makefile.am b/ipa-server/ipa-gui/ipagui/static/images/branding/Makefile.am
index fcf2fdc11..cb0a81424 100644
--- a/ipa-server/ipa-gui/ipagui/static/images/branding/Makefile.am
+++ b/ipa-server/ipa-gui/ipagui/static/images/branding/Makefile.am
@@ -11,4 +11,5 @@ EXTRA_DIST =			\
 
 MAINTAINERCLEANFILES =		\
 	*~			\
+	*.pyc			\
 	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/static/images/template/Makefile.am b/ipa-server/ipa-gui/ipagui/static/images/template/Makefile.am
index dc769d846..a446ce637 100644
--- a/ipa-server/ipa-gui/ipagui/static/images/template/Makefile.am
+++ b/ipa-server/ipa-gui/ipagui/static/images/template/Makefile.am
@@ -17,4 +17,5 @@ EXTRA_DIST =			\
 
 MAINTAINERCLEANFILES =		\
 	*~			\
+	*.pyc			\
 	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/static/javascript/Makefile.am b/ipa-server/ipa-gui/ipagui/static/javascript/Makefile.am
index 908569afc..a2ca2289b 100644
--- a/ipa-server/ipa-gui/ipagui/static/javascript/Makefile.am
+++ b/ipa-server/ipa-gui/ipagui/static/javascript/Makefile.am
@@ -17,4 +17,5 @@ EXTRA_DIST =			\
 
 MAINTAINERCLEANFILES =		\
 	*~			\
+	*.pyc			\
 	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/Makefile.am b/ipa-server/ipa-gui/ipagui/subcontrollers/Makefile.am
index 2f596f2ef..a0c6393fe 100644
--- a/ipa-server/ipa-gui/ipagui/subcontrollers/Makefile.am
+++ b/ipa-server/ipa-gui/ipagui/subcontrollers/Makefile.am
@@ -16,4 +16,5 @@ EXTRA_DIST =			\
 
 MAINTAINERCLEANFILES =		\
 	*~			\
+	*.pyc			\
 	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/templates/Makefile.am b/ipa-server/ipa-gui/ipagui/templates/Makefile.am
index 6626ad8c2..4bf8f142d 100644
--- a/ipa-server/ipa-gui/ipagui/templates/Makefile.am
+++ b/ipa-server/ipa-gui/ipagui/templates/Makefile.am
@@ -45,4 +45,5 @@ EXTRA_DIST =			\
 
 MAINTAINERCLEANFILES =		\
 	*~			\
+	*.pyc			\
 	Makefile.in
diff --git a/ipa-server/ipa-gui/ipagui/tests/Makefile.am b/ipa-server/ipa-gui/ipagui/tests/Makefile.am
index 9902fef72..bf06ef2fa 100644
--- a/ipa-server/ipa-gui/ipagui/tests/Makefile.am
+++ b/ipa-server/ipa-gui/ipagui/tests/Makefile.am
@@ -12,4 +12,5 @@ EXTRA_DIST =			\
 
 MAINTAINERCLEANFILES =		\
 	*~			\
+	*.pyc			\
 	Makefile.in