diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index b7abdf16958..e457d8227f6 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep  3 10:11:32 1998  Robert Lipe   <robertl@dgii.com>
+
+	* egcs_update: Do the pass 1 CVS update only for files that
+	may reasonably be under CVS control. 
+
 1998-08-14  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
 	* test_installed: new script for testing already-installed
diff --git a/contrib/egcs_update b/contrib/egcs_update
index c2cf2c9deb5..9ebe0908397 100755
--- a/contrib/egcs_update
+++ b/contrib/egcs_update
@@ -48,7 +48,14 @@ fi
 
 
 echo "Pass 1: Updating autoconf and bison generated files"
-find . -name configure.in -o -name '*.y' | xargs cvs -q update
+# Do a CVS update on those files that exist in CVS directories.  libg++
+# makes sense to drop into the tree, but it isn't CVS-controlled.
+for i in `find . -name configure.in -o -name '*.y'`
+do
+	D=`dirname $i`/CVS
+	[ -f $i -a  -d $D ]  && echo $i  
+done | xargs cvs -q update
+
 
 echo "Pass 2: Updating full tree"
 cvs -q update ${1+"$@"}