diff --git a/Makefile.am b/Makefile.am
index 7756d429e2..40b2c4d2b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,7 @@
 include $(top_srcdir)/config/common.am
 
-DISTCLEANFILES += -r lyx.1 config.status config.cache config.log \
-	$(srcdir)/sourcedoc/*~ \
-	$(srcdir)/sourcedoc/html $(srcdir)/sourcedoc/latex \
-	$(srcdir)/sourcedoc/man $(srcdir)/sourcedoc/Doxyfile
+DISTCLEANFILES += lyx.1 config.status config.cache config.log \
+	$(srcdir)/sourcedoc/*~ $(srcdir)/sourcedoc/Doxyfile
 
 MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
 	$(srcdir)/configure $(srcdir)/development/lyx.spec \
@@ -62,6 +60,10 @@ doxydoc: sourcedoc/Doxyfile
 	cd sourcedoc; \
 	doxygen ./Doxyfile
 
+distclean-local:
+	rm -rf $(srcdir)/sourcedoc/html $(srcdir)/sourcedoc/latex \
+	$(srcdir)/sourcedoc/main
+
 lgbtags:
 	etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
 
diff --git a/lib/ChangeLog b/lib/ChangeLog
index fce91a96c6..87e41cf1b9 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,8 +1,13 @@
+2002-04-26  Lars Gullik Bjønnes  <larsbj@birdstep.com>
+
+	* Makefile.am (DISTCLEANFILES): don't use -r
+	(distclean-local): new target
+
 2002-04-25  Rob Lahaye  <lahaye@users.sourceforge.net>
 
 	* configure.m4: use gracebat instead of xmgrace in the Grace converters
 	to make the conversion independent of the availability of an Xserver
- 
+
 2002-04-25  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* doc/ExternalMaterial.lyx: remove, since it has been included in
@@ -19,7 +24,7 @@
 2002-04-23  Mike Ressler  <mike.ressler@alum.mit.edu>
 
 	* layouts/aastex.layout: add ProvidesNatbib
-	
+
 	* templates/aastex.lyx: convert to format 220
 
 2002-04-23  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
@@ -46,7 +51,7 @@
 2002-04-10 Herbert Voss  <voss@perce.de>
 
 	* CREDITS: correct email
-  
+
 2002-04-05  Adrien Rebollo  <adrien.rebollo@gmx.fr>
 
 	* kbd/european.kmap: "euro" and "oe" used kmod instead of kmap
@@ -54,7 +59,7 @@
 
 2002-04-05  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
-	* reLyX/acinclude.m4 (RELYX_CHECK_PERL): improve search for perl. 
+	* reLyX/acinclude.m4 (RELYX_CHECK_PERL): improve search for perl.
 
 2002-04-06  André Pönitz <poenitz@gmx.de>
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 984aa2869a..939006f191 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 DISTCLEANFILES = *.orig *.rej *~ *.bak core textclass.lst packages.lst \
-		lyxrc.defaults doc/LyXConfig.lyx doc/LaTeXConfig.lyx -r xfonts
+		lyxrc.defaults doc/LyXConfig.lyx doc/LaTeXConfig.lyx
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 SUBDIRS = reLyX
 
@@ -62,6 +62,9 @@ install-xfonts:
 uninstall-xfonts:
 	rm -rf $(DESTDIR)$(pkgdatadir)/xfonts
 
+distclean-local:
+	rm -rf xfonts
+
 install-data-local: libinstalldirs install-xfonts
 	files=`cd $(srcdir) ; echo $(LIBINSTFILES)` ; \
 	for i in $${files} ; do \