diff --git a/ChangeLog b/ChangeLog
index 5098b6b06..8e296e756 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-10-08  Pavel Roskin  <proski@gnu.org>
 
+	* configure.in: Rename RH_VERSION to RPM_VERSION - not every
+	rpm-based system is Red Hat.  Replace all dashes, not just one.
+
 	* acinclude.m4 (MC_WITH_MCSLANG): Check for terminfo and use
 	termcap if terminfo is missing in the known locations.
 	* configure.in: Remove --with-termcap processing, it is now in
diff --git a/configure.in b/configure.in
index 3980c25c1..29ab50e6b 100644
--- a/configure.in
+++ b/configure.in
@@ -539,7 +539,7 @@ dnl Libraries used only when building the mc binary
 AC_SUBST(MCLIBS)
 
 dnl Version for the RedHat package, without dashes
-RH_VERSION=`echo $VERSION | sed 's/-//'`
+RPM_VERSION=`echo $VERSION | sed 's/-//g'`
 AC_SUBST(RH_VERSION)
 
 if test -n "$use_smbfs"; then
diff --git a/mc.spec.in b/mc.spec.in
index 27904e94e..3906fbed3 100644
--- a/mc.spec.in
+++ b/mc.spec.in
@@ -7,13 +7,13 @@
 
 # Note that this is NOT a relocatable package
 %define ver     @VERSION@
-%define rhver   @RH_VERSION@
+%define rpmver   @RPM_VERSION@
 %define  RELEASE 1
 %define  rel     %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
 
 Summary:   Midnight Commander visual shell
 Name:      mc
-Version:   %rhver
+Version:   %rpmver
 Release:   %rel
 Epoch:     1
 Copyright: GPL