diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index 1f279c17..b3a28d09 100644
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -89,6 +89,8 @@ EXTRA_DIST = \
 	wrapper_bottom.c \
 	wrapper_top.c 
 
+clean-local:
+	-rm -rf com
 
 # Some of the following classes are built only if junit is available
 if JUNIT_ENABLED
diff --git a/bindings/perl/Makefile.am b/bindings/perl/Makefile.am
index ddd1aade..380270e6 100644
--- a/bindings/perl/Makefile.am
+++ b/bindings/perl/Makefile.am
@@ -9,7 +9,7 @@ am__v_SUBMAKE_POSTFIX_0 = 2>&1 >$$LOG && rm $$LOG ) || ( cat $$LOG; rm $$LOG )
 endif
 
 MAINTAINERCLEANFILES = Makefile.in
-MOSTLYCLEANFILES =
+DISTCLEANFILES = __init__.pyc lang.pyc
 
 LASSO_XS_CFLAGS = -fno-strict-aliasing $(LASSO_CFLAGS) $(LASSO_CORE_CFLAGS) $(PERL_CFLAGS) $(AM_CFLAGS)
 
diff --git a/bindings/php5/Makefile.am b/bindings/php5/Makefile.am
index bf05f7f8..a1ee2209 100644
--- a/bindings/php5/Makefile.am
+++ b/bindings/php5/Makefile.am
@@ -1,5 +1,5 @@
-MAINTAINERCLEANFILES = Makefile.in
-MOSTLYCLEANFILES = __init__.pyc lang.pyc php_code.pyc wrapper_header.pyc wrapper_top.pyc
+CLEANFILES = lasso.php php_lasso.h _lasso.c
+DISTCLEANFILES = __init__.pyc lang.pyc php_code.pyc wrapper_header.pyc wrapper_top.pyc wrapper_source.pyc
 SUBDIRS = examples tests
 
 INCLUDES = \
@@ -35,8 +35,6 @@ lasso.php _lasso.c: lang.py wrapper_source.py wrapper_header.py wrapper_source_t
 doc:
 	phpdoc -o HTML:frames:earthli -f lasso.php -t docs
 
-clean-local:
-	-rm -f lasso.php php_lasso.h _lasso.c
 
 .PHONY: doc
 
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index 129c7ffd..762bbd13 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -1,5 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
-MOSTLYCLEANFILES = __init__.pyc lang.pyc
+CLEANFILES = _lasso.c lasso.py
+DISTCLEANFILES = __init__.pyc lasso.pyc lang.pyc
 SUBDIRS = tests
 
 if PYTHON_ENABLED
@@ -38,7 +39,5 @@ endif
 lasso.py _lasso.c: lang.py wrapper_top.c wrapper_bottom.c ../bindings.py
 	$(AM_V_GEN) $(PYTHON) $(top_srcdir)/bindings/bindings.py -l python --src-dir=$(top_srcdir)/lasso/ $(EXTRA_ARGS)
 
-clean-local:
-	-rm -f lasso.py lasso.pyc _lasso.c
 
 endif
diff --git a/bindings/python/tests/Makefile.am b/bindings/python/tests/Makefile.am
index c2130fb3..205e7613 100644
--- a/bindings/python/tests/Makefile.am
+++ b/bindings/python/tests/Makefile.am
@@ -11,4 +11,5 @@ if WSF_ENABLED
 TESTS += idwsf1_tests.py idwsf2_tests.py
 endif
 
-EXTRA_DIST = profiles_tests.py binding_tests.py idwsf1_tests.py idwsf2_tests.py
+EXTRA_DIST = profiles_tests.py binding_tests.py idwsf1_tests.py idwsf2_tests.py \
+	tests.py XmlTestRunner.py