diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 78f278951..a25bc1896 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 20 17:41:30 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* mkvers.sh: Fix problem with handling of CVS tags causing .rc syntax
+	errors.
+
 Tue Jun 20 13:38:12 2000  Christopher Faylor <cgf@cygnus.com>
 
 	* Makefile.in: Change to build the DLL during a cross-compiler build.
diff --git a/winsup/cygwin/mkvers.sh b/winsup/cygwin/mkvers.sh
index 63a0a594b..f7d71bef9 100755
--- a/winsup/cygwin/mkvers.sh
+++ b/winsup/cygwin/mkvers.sh
@@ -86,6 +86,7 @@ fn=`basename $incfile`
 #
 cvs_tag="`sed 's%^.\(.*\)%\1%' $dir/CVS/Tag 2>/dev/null`"
 
+wv_cvs_tag="$cvs_tag"
 [ -n "$cvs_tag" ] && cvs_tag=" CVS tag"'
 '"$cvs_tag"
 
@@ -164,8 +165,10 @@ cygverhigh=`expr $major / 1000`
 cygverlow=`expr $major % 1000`
 cygwin_ver="$cygverhigh.$cygverlow.$minor"
 if [ -n "$cvs_tag" ]; then
-    cygwin_ver="$cygwin_ver ($cvs_tag)"
+    cvs_tag="`echo $wv_cvs_tag | sed -e 's/-branch.*//'`"
+    cygwin_ver="$cygwin_ver-$cvs_tag"
 fi
 
+echo "Version $cygwin_ver"
 set -$- $builddate
 $windres --include-dir $dir/../w32api/include --include-dir $dir/include --define CYGWIN_BUILD_DATE="$1" --define CYGWIN_BUILD_TIME="$2" --define CYGWIN_VERSION='"'"$cygwin_ver"'"' $rcfile winver.o