diff --git a/ChangeLog b/ChangeLog
index af5a1d10f..c23fc5611 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-11  Henning Meier-Geinitz <henning@meier-geinitz.de>
+
+	* Makefile.in: Remove autoconf temp files and some japi stuff in
+	  distclean target.
+
 2004-05-10  Stéphane Voltz <svoltz@wanadoo.fr>
 
 	* backend/umax_pp_low.c : fixed 300x600 dpi scans, direct
diff --git a/Makefile.in b/Makefile.in
index 03358f930..92e52c8f9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -101,10 +101,13 @@ distclean: clean distclean-recursive
 	rm -f sane-backends-*.lsm
 	rm -f $(distdir).tar.gz.md5
 	rm -f japi/Makefile testsuite/Makefile
+	rm -f japi/*.class japi/*.h
+	rm -rf japi/.libs 
 	rm -f $(addprefix japi/,$(DISTCLEAN_FILES))
 	rm -f $(addprefix testsuite/,$(DISTCLEAN_FILES))
 	rm -rf $(distdir)
 	rm -f TAGS
+	rm -rf autom4te.cache
 
 depend: depend-recursive