diff --git a/maintainer/git-version-gen b/maintainer/git-version-gen
index 4a6d3312..0ca6bd34 100755
--- a/maintainer/git-version-gen
+++ b/maintainer/git-version-gen
@@ -215,6 +215,10 @@ if test "x$v_from_git" != x; then
   esac
 fi
 
+# Replace any dashes with underscores in the resulting version, to keep
+# rpmbuild happy. See https://github.com/semver/semver/issues/145.
+v=`echo "$v" | sed 's/-/_/g'`
+
 # Omit the trailing newline, so that m4_esyscmd can use the result directly.
 printf %s "$v"