diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 9a5987249faa..322744364a2c 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-04  Mark Mitchell  <mark@codesourcery.com>
+
+	* newcvsroot: Handle filenames that contain spaces.
+
 2000-06-03  Zack Weinberg  <zack@wolery.cumb.org>
 
 	* test_summary: In generated script, use cat <<'EOF' not cat <<\EOF.
diff --git a/contrib/newcvsroot b/contrib/newcvsroot
index d264bbf7de31..43e8e079c0b9 100755
--- a/contrib/newcvsroot
+++ b/contrib/newcvsroot
@@ -24,10 +24,10 @@ esac
 find $topdir \( -name Repository -o -name Root \) -print | while read f; do
 
 case "$f" in
-*/CVS/Root) echo $root > $f ;;
+*/CVS/Root) echo $root > "$f" ;;
 */CVS/Repository)
   r=${module}${f#${topdir}}
-  echo > $f $rep/${r%/CVS/Repository}
+  echo > "$f" $rep/${r%/CVS/Repository}
   ;;
 esac