diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index 2678ce98..566a062a 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -14,7 +14,6 @@ PCKG_RPM_DEVEL_I386      ?= $(RPM_PROJECT)-devel-$(RPM_VERSION).i386.rpm
 PCKG_RPM_SRC             ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm
 RPM_VERSION              ?= $(VERSION)
 
-
 include $(MODDIR)/make/upload-defs.mk
 
 DIST_FILES                = $(shell echo $(REMOTE_TARGETS) | sed 's/\b.*\///g; s/:.*\b//g')
@@ -27,6 +26,15 @@ DIST_PCKG_RPM             = $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386) $(DIST_PCKG_DI
 include $(MODDIR)/make/tag-rules.mk
 include $(MODDIR)/make/upload-rules.mk
 
+all:
+upload_stable: upload_STABLE.dist
+upload_rc: upload_RC.dist
+tgz: $(PCKG_TAR)
+distclean: rpmclean
+clean: rpmclean
+ftag: ftag.dist
+rpmrelease: upload.dist
+
 rpmclean:
 	rm -rf $(DIST_SRC_DIR) $(PCKG_TAR) *.dist
 
@@ -81,7 +89,8 @@ rpminstall.dist: $(DIST_PCKG_RPM)
 	sudo /bin/rpm -U $<
 	touch $@
 
-tgz: $(PCKG_TAR)
-distclean: rpmclean
-clean: rpmclean
-ftag: ftag.dist
+upload_%.dist: %_$(PROJECT_CAPNAME)_RPM_RUN_I386
+	cvs commit $<
+	$(UPLOAD_SH) $< $(REMOTE_TARGET_PREFIX)$(PCKG_ROOT)/$<:640:750:$(FTP_RUN_USER).$(FTP_RUN_GROUP)
+	touch $@
+