diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index ec96d331..7d9597bd 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -18,6 +18,7 @@ FTP_HOST                 ?= ftp.jannet.de
 FTP_HOST_LOGIN           ?= root
 RPM_PROJECT              ?= $(PROJECT)
 RPM_VERSION              ?= $(VERSION)
+RPM_ARCH                 ?= i586
 RPMBUILD                 ?= rpmbuild
 
 include $(MODDIR)/make/tag-defs.mk
@@ -27,8 +28,8 @@ DIST_SRC_DIR              = dist/src/$(RPM_PROJECT)-$(RPM_VERSION)
 DIST_PCKG_DIR             = dist/pckg
 
 PCKG_TAR                 ?= $(RPM_PROJECT)-$(RPM_VERSION).tar.gz
-PCKG_RPM_RUN_I386        ?= $(RPM_PROJECT)-run-$(RPM_VERSION).i386.rpm
-PCKG_RPM_DEVEL_I386      ?= $(RPM_PROJECT)-devel-$(RPM_VERSION).i386.rpm
+PCKG_RPM_RUN_I386        ?= $(RPM_PROJECT)-run-$(RPM_VERSION).$(RPM_ARCH).rpm
+PCKG_RPM_DEVEL_I386      ?= $(RPM_PROJECT)-devel-$(RPM_VERSION).$(RPM_ARCH).rpm
 PCKG_RPM_SRC             ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm
 RPM_VERSION              ?= $(VERSION)
 
@@ -36,7 +37,7 @@ include $(MODDIR)/make/upload-defs.mk
 
 DIST_FILES                = $(shell echo $(REMOTE_TARGETS) | sed 's/\b.*\///g; s/:.*\b//g')
 
-RPMS_DIR                  = /usr/src/packages/RPMS/i386
+RPMS_DIR                  = /usr/src/packages/RPMS/$(RPM_ARCH)
 SRPMS_DIR                 = /usr/src/packages/SRPMS
 DIST_DIRS                 = $(DIST_SRC_DIR) $(DIST_PCKG_DIR)
 DIST_PCKG_RPM             = $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386) $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386)
@@ -95,7 +96,7 @@ cpfiles.dist:
 		-czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR))
 
 %.src.rpm: %.tar.gz
-	rpm -ts $<
+	$(RPMBUILD) -ts $<
 	cp $(SRPMS_DIR)/$(notdir $@) $@
 
 $(DIST_PCKG_RPM): $(DIST_PCKG_DIR)/$(PCKG_TAR)