diff --git a/make/upload-defs.mk b/make/upload-defs.mk
index 7f44bd3a..a8ddbd8a 100644
--- a/make/upload-defs.mk
+++ b/make/upload-defs.mk
@@ -1,38 +1,15 @@
-# this makefile needs
-# PCKG_ROOT
-# VERSION
-# MOD_SCRIPT_DIR
-
-UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
-
-FTP_FILE_MODE    ?= 640
-FTP_DIR_MODE     ?= 750
-FTP_SRC_GROUP    ?= spidsrc
-FTP_SRC_USER     ?= $(shell whoami)
-FTP_RUN_GROUP    ?= spidrun
-FTP_RUN_USER     ?= $(shell whoami)
-FTP_DEV_GROUP    ?= spiddev
-FTP_DEV_USER     ?= $(shell whoami)
-FTP_HOST         ?= ftp.jannet.de
-FTP_HOST_LOGIN   ?= root
-
-PCKG_ROOT                 = $(FTP_PCKG_DIR)/$(RPM_PROJECT)
-CURRENT_SRC               = $(PCKG_ROOT)/src/$(PCKG_TAR)
-CURRENT_RPM_RUN_I386      = $(PCKG_ROOT)/rpm/run/$(PCKG_RPM_RUN_I386)
-CURRENT_RPM_DEVEL_I386    = $(PCKG_ROOT)/rpm/devel/$(PCKG_RPM_DEVEL_I386)
-CURRENT_RPM_SRC           = $(PCKG_ROOT)/rpm/src/$(PCKG_RPM_SRC)
-REMOTE_TARGET_PREFIX      = rsync_ssh://$(FTP_HOST_LOGIN)@$(FTP_HOST):/home/ftp/dat
-REMOTE_TARGETS            = \
-	$(REMOTE_TARGET_PREFIX)$(CURRENT_SRC):$(FTP_FILE_MODE):$(FTP_DIR_MODE):$(FTP_SRC_USER).$(FTP_SRC_GROUP) \
-	$(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_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
+UPLOAD_SH             ?= $(MOD_SCRIPT_DIR)/upload.sh
+UPLOAD_PROJECT        ?= $(PROJECT)
+UPLOAD_MODULE         ?= $(UPLOAD_PROJECT)
+UPLOAD_FILE_MODE      ?= 640
+UPLOAD_DIR_MODE       ?= 750
+UPLOAD_GROUP          ?= $(shell id -ng)
+UPLOAD_USER           ?= $(shell id -nu)
+UPLOAD_HOST_LOGIN     ?= root
+UPLOAD_HOST           ?= www.jannet.de
+UPLOAD_FILE_ROOT      ?= /srv/www/htdocs/jannet.de_443/proj/$(UPLOAD_MODULE)
+UPLOAD_TARGET_PREFIX  ?= rsync_ssh://$(UPLOAD_HOST_LOGIN)@$(UPLOAD_HOST):$(UPLOAD_FILE_ROOT)/
+UPLOAD_FILES          ?= 
+REMOTE_TARGETS        ?= \
+	$(foreach f,$(UPLOAD_FILES),$(UPLOAD_TARGET_PREFIX)$f:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP))
 
diff --git a/make/upload-rules.mk b/make/upload-rules.mk
index d4b26f48..73fccfc5 100644
--- a/make/upload-rules.mk
+++ b/make/upload-rules.mk
@@ -14,3 +14,8 @@ yupdate.%.dist:
 CURRENT_%:
 	echo $($(notdir $@)) > $@
 
+clean: upload.clean
+
+upload.clean:
+	rm -f upload.dist yupdate.*.dist
+