diff --git a/ChangeLog b/ChangeLog
index 1badadb..d95282e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-11-19    <tytso@valinux.com>
+
+	* Makefile.in (distclean): Remove TAGS and Makefile.in.old from
+		the source directory.  Also, when making the .exclude file
+		for the source_tar_file, exclude those two files as well.
+
 1999-11-10    <tytso@valinux.com>
 
 	* Release of E2fsprogs 1.18
diff --git a/Makefile.in b/Makefile.in
index 17c1294..d47e85b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -90,10 +90,14 @@
 
 mostlyclean-local:
 	$(RM) -f \#* *~ core MAKELOG 
+
 clean-local: mostlyclean-local
+
 distclean-local: clean-local
-	$(RM) -f include/asm/types.h $(SUBST_CONF)
-	$(RM) -f config.status config.log config.cache MCONFIG Makefile
+	$(RM) -f include/asm/types.h $(SUBST_CONF) \
+		config.status config.log config.cache MCONFIG Makefile \
+		$(srcdir)/TAGS $(srcdir)/Makefile.in.old
+
 realclean-local: distclean-local
 	$(RM) -f configure
 
@@ -117,6 +121,7 @@
 	a=$(SRCROOT); \
 	(cd $(srcdir)/.. ; find e2fsprogs \( -name \*~ -o -name \*.orig \
 		-o -name CVS -o -name \*.rej -o -name Makefile.pq \
+		-o -name TAGS -o -name \*.old \
 		-o -name TODO -o -name changed-files -o -name .#\* \) \
 		-print) | sed -e "s/e2fsprogs/$$a/" > $(srcdir)/.exclude-file
 	echo "$(SRCROOT)/build" >> $(srcdir)/.exclude-file
diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog
index b1bf057..fe3bde1 100644
--- a/debugfs/ChangeLog
+++ b/debugfs/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-19    <tytso@valinux.com>
+
+	* Makefile.in (distclean): Remove TAGS and Makefile.in.old from
+		the source directory.
+
 1999-11-10    <tytso@valinux.com>
 
 	* Release of E2fsprogs 1.18
diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in
index 8898735..4ef2eae 100644
--- a/debugfs/Makefile.in
+++ b/debugfs/Makefile.in
@@ -65,7 +65,8 @@
 
 mostlyclean: clean
 distclean: clean
-	$(RM) -f debug_cmds.c .depend Makefile
+	$(RM) -f debug_cmds.c .depend Makefile $(srcdir)/TAGS \
+		$(srcdir)/Makefile.in.old
 
 # +++ Dependency line eater +++
 # 
diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 6af482d..3470a3e 100644
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-19    <tytso@valinux.com>
+
+	* Makefile.in (distclean): Remove TAGS and Makefile.in.old from
+		the source directory.
+
 1999-11-10    <tytso@valinux.com>
 
 	* Release of E2fsprogs 1.18
diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
index b2bedb5..87a9cf6 100644
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@ -144,7 +144,7 @@
 
 mostlyclean: clean
 distclean: clean
-	$(RM) -f .depend Makefile
+	$(RM) -f .depend Makefile $(srcdir)/TAGS $(srcdir)/Makefile.in.old
 
 # +++ Dependency line eater +++
 # 
diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog
index f67aad5..afdcfa6 100644
--- a/lib/e2p/ChangeLog
+++ b/lib/e2p/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-19    <tytso@valinux.com>
+
+	* Makefile.in (distclean): Remove TAGS and Makefile.in.old from
+		the source directory.
+
 1999-11-10    <tytso@valinux.com>
 
 	* Release of E2fsprogs 1.18
diff --git a/lib/e2p/Makefile.in b/lib/e2p/Makefile.in
index 334ecdd..5ee673b 100644
--- a/lib/e2p/Makefile.in
+++ b/lib/e2p/Makefile.in
@@ -85,7 +85,7 @@
 	$(RM) -f ../libe2p.a ../libe2p_p.a
 mostlyclean:: clean
 distclean:: clean
-	$(RM) -f .depend Makefile
+	$(RM) -f .depend Makefile $(srcdir)/TAGS $(srcdir)/Makefile.in.old
 
 # +++ Dependency line eater +++
 # 
diff --git a/lib/et/ChangeLog b/lib/et/ChangeLog
index 7f3ccb3..47e3301 100644
--- a/lib/et/ChangeLog
+++ b/lib/et/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-19    <tytso@valinux.com>
+
+	* Makefile.in (distclean): Remove TAGS and Makefile.in.old from
+		the source directory.
+
 1999-11-10    <tytso@valinux.com>
 
 	* Release of E2fsprogs 1.18
diff --git a/lib/et/Makefile.in b/lib/et/Makefile.in
index d7e16ff..a30e3b3 100644
--- a/lib/et/Makefile.in
+++ b/lib/et/Makefile.in
@@ -113,7 +113,7 @@
 	$(RM) -f ../libcom_err.a ../libcom_err_p.a
 mostlyclean:: clean
 distclean:: clean
-	$(RM) -f .depend Makefile
+	$(RM) -f .depend Makefile $(srcdir)/TAGS $(srcdir)/Makefile.in.old
 
 # +++ Dependency line eater +++
 # 
diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index 338b16d..d669693 100644
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-19    <tytso@valinux.com>
+
+	* Makefile.in (distclean): Remove TAGS and Makefile.in.old from
+		the source directory.
+
 1999-11-10    <tytso@valinux.com>
 
 	* Release of E2fsprogs 1.18
diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index 4767521..e323fde 100644
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -189,12 +189,13 @@
 
 clean::
 	$(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/* checker/* \
-		ext2_err.et ext2_err.c ext2_err.h \
+		tst_badblocks tst_iscan ext2_err.et ext2_err.c ext2_err.h \
 		../libext2fs.a ../libext2fs_p.a ../libext2fs_chk.a
 
 mostlyclean:: clean
 distclean:: clean
-	$(RM) -f .depend ext2_err.c ext2_err.h Makefile
+	$(RM) -f .depend ext2_err.c ext2_err.h Makefile \
+		$(srcdir)/TAGS $(srcdir)/Makefile.in.old
 
 # +++ Dependency line eater +++
 # 
diff --git a/lib/ss/ChangeLog b/lib/ss/ChangeLog
index 3bc0348..b619e51 100644
--- a/lib/ss/ChangeLog
+++ b/lib/ss/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-19    <tytso@valinux.com>
+
+	* Makefile.in (distclean): Remove TAGS and Makefile.in.old from
+		the source directory.
+
 1999-11-10    <tytso@valinux.com>
 
 	* Release of E2fsprogs 1.18
diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in
index 87825c7..b71604f 100644
--- a/lib/ss/Makefile.in
+++ b/lib/ss/Makefile.in
@@ -158,7 +158,7 @@
 
 mostlyclean:: clean
 distclean:: clean
-	$(RM) -f .depend Makefile
+	$(RM) -f .depend Makefile $(srcdir)/TAGS $(srcdir)/Makefile.in.old
 
 # +++ Dependency line eater +++
 # 
diff --git a/lib/uuid/ChangeLog b/lib/uuid/ChangeLog
index c717b63..a2f683e 100644
--- a/lib/uuid/ChangeLog
+++ b/lib/uuid/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-19    <tytso@valinux.com>
+
+	* Makefile.in (distclean): Remove TAGS and Makefile.in.old from
+		the source directory.
+
 1999-11-10    <tytso@valinux.com>
 
 	* Release of E2fsprogs 1.18
diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in
index 0fd7335..3b51435 100644
--- a/lib/uuid/Makefile.in
+++ b/lib/uuid/Makefile.in
@@ -149,7 +149,7 @@
 
 mostlyclean:: clean
 distclean:: clean
-	$(RM) -f .depend Makefile
+	$(RM) -f .depend Makefile $(srcdir)/TAGS $(srcdir)/Makefile.in.old
 
 # +++ Dependency line eater +++
 # 
diff --git a/misc/ChangeLog b/misc/ChangeLog
index 00aa848..6ac29ee 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-19    <tytso@valinux.com>
+
+	* Makefile.in (distclean): Remove TAGS and Makefile.in.old from
+		the source directory.
+
 1999-11-10    <tytso@valinux.com>
 
 	* Release of E2fsprogs 1.18
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 9cf7af5..0460106 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -169,7 +169,7 @@
 
 mostlyclean: clean
 distclean: clean
-	$(RM) -f .depend Makefile
+	$(RM) -f .depend Makefile $(srcdir)/TAGS $(srcdir)/Makefile.in.old
 
 # +++ Dependency line eater +++
 # 
diff --git a/resize/ChangeLog b/resize/ChangeLog
index 539f608..15490d2 100644
--- a/resize/ChangeLog
+++ b/resize/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-19    <tytso@valinux.com>
+
+	* Makefile.in (distclean): Remove TAGS and Makefile.in.old from
+		the source directory.
+
 1999-11-10    <tytso@valinux.com>
 
 	* Release of E2fsprogs 1.18
diff --git a/resize/Makefile.in b/resize/Makefile.in
index a4626b6..07bdee5 100644
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -87,8 +87,9 @@
 		resize2fs.static test_extent.out
 
 mostlyclean: clean
+
 distclean: clean
-	$(RM) -f .depend Makefile
+	$(RM) -f .depend Makefile $(srcdir)/TAGS $(srcdir)/Makefile.in.old
 
 #
 # Kludge to create a "special" e2fsprogs distribution file.
diff --git a/tests/progs/ChangeLog b/tests/progs/ChangeLog
index 3f7f5bc..e61e280 100644
--- a/tests/progs/ChangeLog
+++ b/tests/progs/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-19    <tytso@valinux.com>
+
+	* Makefile.in (distclean): Remove TAGS and Makefile.in.old from
+		the source directory.
+
 1999-11-10    <tytso@valinux.com>
 
 	* Release of E2fsprogs 1.18
diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in
index c6d4f8b..249666a 100644
--- a/tests/progs/Makefile.in
+++ b/tests/progs/Makefile.in
@@ -53,7 +53,7 @@
 
 mostlyclean: clean
 distclean: clean
-	$(RM) -f .depend Makefile
+	$(RM) -f .depend Makefile $(srcdir)/TAGS $(srcdir)/Makefile.in.old
 
 # +++ Dependency line eater +++
 # 
diff --git a/util/ChangeLog b/util/ChangeLog
index 0592fae..600cf13 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-19    <tytso@valinux.com>
+
+	* Makefile.in (distclean): Remove TAGS and Makefile.in.old from
+		the source directory.
+
 1999-11-10    <tytso@valinux.com>
 
 	* Release of E2fsprogs 1.18
diff --git a/util/Makefile.in b/util/Makefile.in
index 75afdff..ed224a4 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -29,7 +29,7 @@
 mostlyclean: clean
 
 distclean: clean
-	$(RM) -f .depend Makefile
+	$(RM) -f .depend Makefile $(srcdir)/TAGS $(srcdir)/Makefile.in.old
 
 # +++ Dependency line eater +++
 #