diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index 36de2774..aaa0441a 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -1,3 +1,4 @@
+CREATE_DEVEL             ?= true
 UPLOAD_SH                 = $(MOD_SCRIPT_DIR)/upload.sh
 RPM_PROJECT              ?= $(FLAVOUR_PREFIX)$(PROJECT)
 MKSPEC_SH                ?= $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
@@ -32,7 +33,9 @@ DIST_PCKG_DIR             = $(DIST_DIR)/pckg
 
 PCKG_TAR                 ?= $(RPM_PROJECT)-$(RPM_VERSION).tar.gz
 PCKG_RPM_RUN_I386        ?= $(RPM_PROJECT)-run-$(RPM_VERSION).$(RPM_ARCH).rpm
+ifeq ($(CREATE_DEVEL),true)
 PCKG_RPM_DEVEL_I386      ?= $(RPM_PROJECT)-devel-$(RPM_VERSION).$(RPM_ARCH).rpm
+endif
 PCKG_RPM_SRC             ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm
 
 include $(MODDIR)/make/upload-defs.mk
@@ -43,7 +46,11 @@ GENERATED                 = $(sort $(shell find . -name '*.in' | \
 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)
+DIST_PCKG_RPM             = $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386)
+ifeq ($(CREATE_DEVEL),true)
+DIST_PCKG_RPM            += $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386)
+endif
+
 RPM_REQUIRES_DEVEL       += $(RPM_PROJECT)-run = $(RPM_VERSION)
 
 unexport RPM_VERSION VERSION DIST_SRC_DIR
diff --git a/make/upload-defs.mk b/make/upload-defs.mk
index b5d5913a..7f44bd3a 100644
--- a/make/upload-defs.mk
+++ b/make/upload-defs.mk
@@ -27,8 +27,12 @@ REMOTE_TARGETS            = \
 	$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_SRC:$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP) \
 	$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_RUN_I386):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_RUN_USER).$(FTP_RUN_GROUP)\
 	$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_RUN_I386:$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_RUN_USER).$(FTP_RUN_GROUP) \
-	$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_DEVEL_I386):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_DEV_USER).$(FTP_DEV_GROUP) \
-	$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_DEVEL_I386:$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_DEV_USER).$(FTP_DEV_GROUP) \
 	$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_SRC):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP) \
 	$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_SRC:$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP)
 
+ifeq ($(CREATE_DEVEL),true)
+REMOTE_TARGETS           += \
+	$(REMOTE_TARGET_PREFIX)$(CURRENT_RPM_DEVEL_I386):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_DEV_USER).$(FTP_DEV_GROUP) \
+	$(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/CURRENT_RPM_DEVEL_I386:$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_DEV_USER).$(FTP_DEV_GROUP)
+endif
+