diff --git a/ChangeLog b/ChangeLog
index 23cf56b96..f390fa434 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-16  Joel Brobecker  <brobecker@adacore.com>
+
+	* src-release (VER): When using $(TOOL)/common/create-version.sh,
+	strip the "-cvs" suffix from the version number if present.
+
 2013-08-12  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
 
 	* configure.ac: Sync with GCC repo.
diff --git a/src-release b/src-release
index cf6d266a2..c2f4727b3 100644
--- a/src-release
+++ b/src-release
@@ -74,7 +74,7 @@ VER = `	if grep 'AM_INIT_AUTOMAKE.*BFD_VERSION' $(TOOL)/configure.in >/dev/null
 	  $(TOOL)/common/create-version.sh $(TOOL) \
 	    'dummy-host' 'dummy-target' \
 	    VER.tmp; \
-	  cat VER.tmp | grep 'version\[\]' | sed 's/.*"\([^"]*\)".*/\1/'; \
+	  cat VER.tmp | grep 'version\[\]' | sed 's/.*"\([^"]*\)".*/\1/' | sed 's/-cvs$$//'; \
           rm -f VER.tmp; \
 	elif test -f $(TOOL)/version.in; then \
 	  head -1 $(TOOL)/version.in; \