diff --git a/Makefile.am b/Makefile.am
index 724eec0..9375024 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,8 +13,9 @@ EXTRA_DIST = COPYING cryptic.pc.in autogen.sh autoregen.sh gtk-doc.make
 # clean nromal + rm -f cryptic.pc
 #-rm si rm échoue pas de blocage...
 clean-local:
-	-rm -f cryptic.pc
+	-rm -f cryptic.pc aclocal.m4 config.* configure cryptic-src-config depcomp install-sh libtool ltmain.sh Makefile Makefile.in stamp-h1
+	-rm -rf autom4te.cache missing
 
 dist-hook:
-	-rm -rf `find $(distdir) -name .svn`
+	-rm -rf `find $(distdir) -name .git`
 
diff --git a/bindings/Makefile.am b/bindings/Makefile.am
index 9276412..13c2664 100644
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@ -13,9 +13,7 @@ endif
 #SUBDIRS += perl
 #endif
 
-CLEANFILES = bindings.pyc lang_java.pyc lang_python.pyc lang_php5.pyc \
-             utils.pyc lang_php5_helpers/__init__.pyc lang_php5_helpers/php_code.pyc \
-              lang_php5_helpers/wrapper_header.pyc lang_php5_helpers/wrapper_source.pyc
+CLEANFILES = *.pyc Makefile Makefile.in
 
 EXTRA_DIST = bindings.py \
 	overrides.xml \
diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index 242d15a..3b67609 100644
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -67,6 +67,10 @@ $(java_cryptic_source_files)  com_entrouvert_cryptic_CrypticJNI.c: wrapper_top.c
 	$(AM_V_GEN) $(PYTHON) $(top_srcdir)/bindings/bindings.py $(BINDING_OPTION) -l java --src-dir=$(top_srcdir)/cryptic/ $(EXTRA_ARGS) && cp $(srcdir)/GObject.java com/entrouvert/cryptic
 
 
+clean-local:
+	-rm -f *.pyc com_entrouvert_cryptic_CrypticJNI.* cryptic.jar Makefile Makefile.in
+	-rm -rf com
+
 #doc-publish: doc
 #	tar czf doc.tgz -C doc .
 #	scp doc.tgz bdauvergne@perso.entrouvert.org:
@@ -74,9 +78,9 @@ $(java_cryptic_source_files)  com_entrouvert_cryptic_CrypticJNI.c: wrapper_top.c
 #	rm doc.tgz
 
 #$(TESTS) \
-MOSTLYCLEANFILES =  com_entrouvert_cryptic_CrypticJNI.c  com_entrouvert_cryptic_CrypticJNI.h \
-		    com/entrouvert/cryptic/* cryptic.jar *.class \
-		    __init__.pyc lang.pyc
+#MOSTLYCLEANFILES =  com_entrouvert_cryptic_CrypticJNI.c  com_entrouvert_cryptic_CrypticJNI.h \
+#		    com/entrouvert/cryptic/* cryptic.jar *.class \
+#		    __init__.pyc lang.pyc
 
 
 # Some of the following classes are built only if junit is available
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index 5779d56..aad5db7 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -28,6 +28,6 @@ cryptic.py _cryptic.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)/cryptic/ $(EXTRA_ARGS)
 
 clean-local:
-	-rm -f cryptic.py cryptic.pyc _cryptic.c
+	-rm -f cryptic.py cryptic.pyc _cryptic.c Makefile Makefile.in
 
 endif