diff --git a/ChangeLog b/ChangeLog
index 93733c26ad..bc4a69edbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 16 10:06:21 2000  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	Thu Apr 27 11:01:48 2000 Andrew Cagney <cagney@b1.cygnus.com>:
+	* Makefile.in (do-tar-bz2, do-md5sum): Skip CVS directories.
+
 Tue May 16 09:57:35 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	Wed Apr 26 17:03:53 2000 Andrew Cagney <cagney@b1.cygnus.com>:
diff --git a/Makefile.in b/Makefile.in
index 038022c09e..8e26f2d324 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1793,13 +1793,16 @@ do-proto-toplev: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex
 .PHONY: do-tar-bz2
 do-tar-bz2:
 	echo "==> Making $(PACKAGE)-$(VER).tar.bz2"
-	tar cfh $(PACKAGE)-$(VER).tar $(PACKAGE)-$(VER)
+	-rm -f $(PACKAGE)-$(VER).tar.bz2
+	find $(PACKAGE)-$(VER) -follow -name CVS -prune -o -type f -print \
+		| tar cTfh - $(PACKAGE)-$(VER).tar
 	$(BZIPPROG) -v -9 $(PACKAGE)-$(VER).tar
 
 .PHONY: do-md5sum
 do-md5sum:
 	echo "==> Adding md5 checksum to top-level directory"
-	( cd proto-toplev && find * -follow -type f -print | xargs $(MD5PROG) ) > md5.sum
+	cd proto-toplev && find * -follow -name CVS -prune -o -type f -print \
+		| xargs $(MD5PROG) > ../md5.sum
 	mv md5.sum proto-toplev
 
 .PHONY: do-djunpack