diff --git a/doc/bitstring/Makefile.am b/doc/bitstring/Makefile.am
index 0cd4589..259ab62 100644
--- a/doc/bitstring/Makefile.am
+++ b/doc/bitstring/Makefile.am
@@ -1,4 +1,5 @@
 EXTRA_DIST = bitstring.ms
+CLEANFILES = index.raw index.ms bitstring.ps bitstring.html
 
 if HAVE_GROFF
 doc_DATA = bitstring.ps
@@ -27,5 +28,3 @@ check:
 	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] bitstring.ms |\
 	    grep -v "Empty command"
 
-clean:
-	rm -f index.raw index.ms bitstring.ps bitstring.html
diff --git a/doc/cprog/Makefile.am b/doc/cprog/Makefile.am
index 47933f5..89f84a9 100644
--- a/doc/cprog/Makefile.am
+++ b/doc/cprog/Makefile.am
@@ -1,4 +1,5 @@
 EXTRA_DIST = cprog.ms
+CLEANFILES = side side.ref side.inx cprog.ps cprog.html
 
 if HAVE_GROFF
 doc_DATA = cprog.ps
@@ -9,10 +10,6 @@ TROFF= groff -ms -t
 UNROFF= unroff -ms
 MKINDEX= awk -f ../util/mkindex.awk
 
-clean: local-clean
-local-clean:
-	rm -f side side.ref side.inx cprog.ps cprog.html
-
 cprog.ps: cprog.ms side.ref side.inx
 	$(MKINDEX) cprog.ms | sed -f side.ref | $(TROFF) 2> /dev/null > $@
 
diff --git a/doc/kernel/Makefile.am b/doc/kernel/Makefile.am
index daee5cf..ab040b9 100644
--- a/doc/kernel/Makefile.am
+++ b/doc/kernel/Makefile.am
@@ -1,4 +1,5 @@
 EXTRA_DIST = kernel.ms
+CLEANFILES = index.raw index.ms kernel.ps kernel.html
 
 if HAVE_GROFF
 doc_DATA = kernel.ps
@@ -27,6 +28,3 @@ check:
 	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] kernel.ms |\
 	    grep -v "Empty command"
 
-clean:
-	rm -f index.raw index.ms kernel.ps kernel.html
-
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 19745aa..a163ce4 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,4 +1,5 @@
 EXTRA_DIST = $(man_MANS)
+CLEANFILES = elk.ps elk.1.html
 
 man_MANS = elk.1
 
@@ -16,9 +17,6 @@ elk.ps: elk.1
 elk.1.html: elk.1
 	$(UNROFF) $?
 
-clean:
-	rm -f elk.ps elk.1.html
-
 install-data-local:
 	rm -f "$(DESTDIR)$(mandir)/scheme-elk.1"
 	ln -s elk.1 "$(DESTDIR)$(mandir)/scheme-elk.1"
diff --git a/doc/oops/Makefile.am b/doc/oops/Makefile.am
index 9a6ffe3..a2b7401 100644
--- a/doc/oops/Makefile.am
+++ b/doc/oops/Makefile.am
@@ -1,4 +1,5 @@
 EXTRA_DIST = oops.ms
+CLEANFILES = index.raw index.ms oops.ps oops.html
 
 if HAVE_GROFF
 doc_DATA = oops.ps
@@ -27,5 +28,3 @@ check:
 	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] oops.ms |\
 	    grep -v "Empty command"
 
-clean:
-	rm -f index.raw index.ms oops.ps oops.html
diff --git a/doc/record/Makefile.am b/doc/record/Makefile.am
index ca8fda9..cbf992c 100644
--- a/doc/record/Makefile.am
+++ b/doc/record/Makefile.am
@@ -1,4 +1,5 @@
 EXTRA_DIST = record.ms
+CLEANFILES = index.raw index.ms record.ps record.html
 
 if HAVE_GROFF
 doc_DATA = record.ps
@@ -27,5 +28,3 @@ check:
 	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] record.ms |\
 	    grep -v "Empty command"
 
-clean:
-	rm -f index.raw index.ms record.ps record.html
diff --git a/doc/regexp/Makefile.am b/doc/regexp/Makefile.am
index 4b65570..755aa05 100644
--- a/doc/regexp/Makefile.am
+++ b/doc/regexp/Makefile.am
@@ -1,4 +1,5 @@
 EXTRA_DIST = regexp.ms
+CLEANFILES = index.raw index.ms regexp.ps regexp.html
 
 if HAVE_GROFF
 doc_DATA = regexp.ps
@@ -27,5 +28,3 @@ check:
 	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] regexp.ms |\
 	    grep -v "Empty command"
 
-clean:
-	rm -f index.raw index.ms regexp.ps regexp.html
diff --git a/doc/unix/Makefile.am b/doc/unix/Makefile.am
index 3d5a098..20a6c42 100644
--- a/doc/unix/Makefile.am
+++ b/doc/unix/Makefile.am
@@ -1,4 +1,5 @@
 EXTRA_DIST = unix.ms
+CLEANFILES = index.raw index.ms unix.ps unix.html
 
 if HAVE_GROFF
 doc_DATA = unix.ps
@@ -27,5 +28,3 @@ check:
 	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] unix.ms |\
 	    grep -v "Empty command"
 
-clean:
-	rm -f index.raw index.ms unix.ps unix.html
diff --git a/doc/usenix/Makefile.am b/doc/usenix/Makefile.am
index e98fdf4..538e7f0 100644
--- a/doc/usenix/Makefile.am
+++ b/doc/usenix/Makefile.am
@@ -1,4 +1,5 @@
 EXTRA_DIST = usenix.ms
+CLEANFILES = tmp.ref usenix.ps
 
 if HAVE_GROFF
 doc_DATA = usenix.ps
@@ -17,6 +18,3 @@ usenix.html: usenix.ms tmp.ref
 tmp.ref: usenix.ms
 	$(TROFF) usenix.ms 2> tmp.ref >/dev/null
 
-clean:
-	rm -f tmp.ref usenix.ps
-
diff --git a/doc/xlib/Makefile.am b/doc/xlib/Makefile.am
index ae8abce..4c4a439 100644
--- a/doc/xlib/Makefile.am
+++ b/doc/xlib/Makefile.am
@@ -1,4 +1,5 @@
 EXTRA_DIST = xlib.ms
+CLEANFILES = index.raw index.ms xlib.ps xlib.html
 
 if HAVE_GROFF
 doc_DATA = xlib.ps
@@ -27,5 +28,3 @@ check:
 	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] xlib.ms |\
 	    grep -v "Empty command"
 
-clean:
-	rm -f index.raw index.ms xlib.ps xlib.html
diff --git a/doc/xt/Makefile.am b/doc/xt/Makefile.am
index 7b376cc..a582d3d 100644
--- a/doc/xt/Makefile.am
+++ b/doc/xt/Makefile.am
@@ -1,4 +1,5 @@
 EXTRA_DIST = xt.ms
+CLEANFILES = index.raw index.ms xt.ps xt.html
 
 if HAVE_GROFF
 doc_DATA = xt.ps
@@ -27,5 +28,3 @@ check:
 	checknr -c.Ul.Pr.Sy.Va.Sh.Ix.Id.Ch -a.Ss.Se.[[.]] xt.ms |\
 	    grep -v "Empty command"
 
-clean:
-	rm -f index.raw index.ms xt.ps xt.html
diff --git a/lib/xwidgets/motif/Makefile.am b/lib/xwidgets/motif/Makefile.am
index feffd69..4ad73a3 100644
--- a/lib/xwidgets/motif/Makefile.am
+++ b/lib/xwidgets/motif/Makefile.am
@@ -1,6 +1,7 @@
 NULL = 
 
 EXTRA_DIST = $(SOURCES_D)
+CLEANFILES = $(SOURCES_C)
 
 pkglib_LTLIBRARIES = $(motif_widgets_la)
 
@@ -17,10 +18,6 @@ motif_widgets_la_LIBADD = $(top_builddir)/src/libelk.la @MOTIF_LIBS@
 .d.c:
 	$(top_builddir)/src/elk -p .:$(top_srcdir)/scm:$(srcdir)/.. -l mkwidget.scm $< $@ motif
 
-clean: clean-local
-clean-local:
-	-rm -f $(SOURCES_C)
-
 SOURCES_C = \
 	arrow-button.c \
 	bulletin-brd.c \
diff --git a/lib/xwidgets/xaw/Makefile.am b/lib/xwidgets/xaw/Makefile.am
index f39cbb5..e98e7e6 100644
--- a/lib/xwidgets/xaw/Makefile.am
+++ b/lib/xwidgets/xaw/Makefile.am
@@ -1,6 +1,7 @@
 NULL = 
 
 EXTRA_DIST = $(SOURCES_D)
+CLEANFILES = $(SOURCES_C)
 
 pkglib_LTLIBRARIES = $(xaw_widgets_la)
 
@@ -17,10 +18,6 @@ xaw_widgets_la_LIBADD = $(top_builddir)/src/libelk.la @XAW_LIBS@
 .d.c:
 	$(top_builddir)/src/elk -p .:$(top_srcdir)/scm:$(srcdir)/.. -l mkwidget.scm $< $@ xaw
 
-clean: clean-local
-clean-local:
-	-rm -f $(SOURCES_C)
-
 SOURCES_C = \
 	ascii.c \
 	box.c \