diff --git a/RPM/quakeforge.spec.in b/RPM/quakeforge.spec.in
index ae6271fe8..5d04529ba 100644
--- a/RPM/quakeforge.spec.in
+++ b/RPM/quakeforge.spec.in
@@ -1,5 +1,5 @@
 %define name	quakeforge
-%define version @VERSION@
+%define version @RPMVERSION@
 %define release 1
 %define builddir $RPM_BUILD_DIR/%{name}-%{version}
 
diff --git a/configure.ac b/configure.ac
index b8e5d5e08..d11d71f33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,8 @@ NQ_VERSION=1.09
 NQ_QSG_VERSION=1.0
 QW_VERSION=2.40
 QW_QSG_VERSION=2.0
+RPMVERSION=`echo $VERSION | tr - _`
+AC_SUBST(RPMVERSION)
 
 AC_DEFINE_UNQUOTED(PROGRAM, 		"$PROGRAM", ["Proper" package name])
 AC_DEFINE_UNQUOTED(NQ_VERSION,		"$NQ_VERSION", [Define this to the NetQuake standard version you support])