diff --git a/ChangeLog b/ChangeLog
index 457a6bb252..616c5c27bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-04-15  Mike Frysinger  <vapier@gentoo.org>
+	    Hans-Peter Nilsson  <hp@axis.com>
+
+	Adjust src-release.sh for sim using the gdb create-version.sh.
+	* sim-release.sh (tar_compress): If there's a fifth parameter,
+	use that in the getver call instead of $tool.
+	(sim_release): Pass gdb as fifth parameter to tar_compress.
+	(SIM_SUPPORT_DIRS): Add gdb/common/create-version.sh.
+
 2015-04-01  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* configure.ac: Add --with-system-zlib.
diff --git a/src-release.sh b/src-release.sh
index 9b985f03e7..40d0126a0a 100755
--- a/src-release.sh
+++ b/src-release.sh
@@ -244,7 +244,8 @@ tar_compress()
     tool=$2
     support_files=$3
     compressors=$4
-    ver=$(getver $tool)
+    verdir=${5:-$tool}
+    ver=$(getver $verdir)
     do_proto_toplev $package $ver $tool "$support_files"
     do_md5sum
     do_tar $package $ver
@@ -295,13 +296,13 @@ gdb_release()
 }
 
 # Corresponding to the CVS "sim" module.
-SIM_SUPPORT_DIRS="bfd opcodes libiberty include intl gdb/version.in makefile.vms zlib"
+SIM_SUPPORT_DIRS="bfd opcodes libiberty include intl gdb/version.in gdb/common/create-version.sh makefile.vms zlib"
 sim_release()
 {
     compressors=$1
     package=sim
     tool=sim
-    tar_compress $package $tool "$SIM_SUPPORT_DIRS" "$compressors"
+    tar_compress $package $tool "$SIM_SUPPORT_DIRS" "$compressors" gdb
 }
 
 usage()