diff --git a/ChangeLog b/ChangeLog
index 009e2b62..b828b40b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-11  Theodore A. Roth  <troth@openavr.org>
+
+	* Makefile.am: Add CLEANFILES to remove all files from a make.
+	* doc/Makefile.am: Ditto
+
 2003-03-11  Theodore A. Roth  <troth@openavr.org>
 
 	* windows/Makefile.am: Fix uninstall-local rule (forget the $$file
diff --git a/Makefile.am b/Makefile.am
index 383795c1..0f3813e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,6 +29,11 @@ EXTRA_DIST   = \
 	avrdude.spec \
 	bootstrap
 
+CLEANFILES = \
+	config_gram.c \
+	config_gram.h \
+	lexer.c
+
 SUBDIRS      = doc @WINDOWS_DIRS@
 DIST_SUBDIRS = doc windows
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6427b6af..da00db63 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -21,6 +21,10 @@
 # $Id$
 #
 
+CLEANFILES = \
+	version.texi \
+	stamp-vti
+
 info_TEXINFOS = avrdude.texi
 
 all-local: info html ps pdf