2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4702a23453b..1b2fe96429b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,9 @@
 
 2007-11-28  Glenn Morris  <rgm@gnu.org>
 
+        * Makefile.in (maintainer-clean): Depend on bootstrap-clean to
+        delete .elc files.
+
         * nxml/nxml-enc.el (xmltok-get-declared-encoding-position):
         Declare as a function.
 
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index ce3361a5678..c81db54c72c 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -295,9 +295,12 @@ bootstrap-prepare:
           $(lisp)/ps-print.el                   \
           $(lisp)/emacs-lisp/cl-loaddefs.el
 
-maintainer-clean: distclean
-        cd $(lisp); rm -f *.elc */*.elc $(AUTOGENEL)
+maintainer-clean: distclean bootstrap-clean
+        cd $(lisp); rm -f $(AUTOGENEL)
 
+## NB note that this rules assume only one level of subdirs below lisp/.
+## If nested subdirs are added, it's probably time to switch to:
+## find $(lisp) -name "*.elc" -exec rm -f '{}' ';'
 bootstrap-clean:
         cd $(lisp); rm -f *.elc */*.elc