diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index 9935d65d..d55f3162 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -4,6 +4,7 @@ CREATE_DEVEL              = false
 endif
 endif
 
+RPM_ARCH                 ?= $(ARCH)
 CREATE_DEVEL             ?= true
 UPLOAD_SH                 = $(MOD_SCRIPT_DIR)/upload.sh
 RPM_PROJECT              ?= $(FLAVOUR_PREFIX)$(PROJECT)
@@ -23,8 +24,7 @@ FTP_HOST_LOGIN           ?= root
 RPM_PROJECT              ?= $(PROJECT)
 RPM_VERSION              ?= $(DIST_VERSION)
 LAST_RPM_VERSION_FILE     = $(TOPDIR)/LAST_RPM_VERSION$(FLAVOUR_SUFFIX)
-LAST_RPM_VERSION         ?= $(shell $(SED) 's/-dev$$//' $(LAST_RPM_VERSION_FILE) 2>/dev/null)
-RPM_ARCH                 ?= $(ARCH)
+LAST_RPM_VERSION         ?= $(shell sh $(MOD_SCRIPT_DIR)/platform-map-file.sh -p $RPM_ARCH $(LAST_RPM_VERSION_FILE) read | $(SED) 's/-dev//'
 RPMBUILD                 ?= rpmbuild
 CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
 HASH                      = $(shell $(cvs_files) | \
@@ -258,20 +258,7 @@ rpm-check-release:
 		echo + source is unmodified ;\
 	fi
 
-rpm-release: rpm-update-release
-	@if ! grep -q "^$(LAST_RPM_VERSION)$$" VERSION; then \
-		$(check_cvs_sync) ;\
-		echo "+ version $(RPM_VERSION) doesn't match latest released rpm version "\
-			"$(LAST_RPM_VERSION), building a new release" ;\
-		make rpm-clean update-repo.dist || exit 1;\
-		cp VERSION $(LAST_RPM_VERSION_FILE) ;\
-		if ! grep -q $(LAST_RPM_VERSION_FILE) CVS/Entries; then \
-			cvs add $(LAST_RPM_VERSION_FILE) ;\
-		fi ;\
-		cvs commit -m "o `$(CAT) $(LAST_RPM_VERSION_FILE)`" $(LAST_RPM_VERSION_FILE) ;\
-	else \
-		echo "+ version matches latest released rpm version" ;\
-	fi
+rpm-release: rpm-release-reinstall
 
 # doesn't work
 # rpm-release-update: rpm-release rpm-update