diff --git a/make/upload-defs.mk b/make/upload-defs.mk
index 56e7fed0..a9b62a89 100644
--- a/make/upload-defs.mk
+++ b/make/upload-defs.mk
@@ -1,4 +1,4 @@
-UPLOAD_SH             ?= $(MOD_SCRIPT_DIR)/upload.sh
+UPLOAD_SH             ?= /bin/bash $(MOD_SCRIPT_DIR)/upload.sh
 UPLOAD_PROJECT        ?= $(PROJECT)
 UPLOAD_MODULE         ?= $(UPLOAD_PROJECT)
 UPLOAD_FILE_MODE      ?= 640
@@ -7,9 +7,25 @@ UPLOAD_GROUP          ?= $(shell id -ng)
 UPLOAD_USER           ?= $(shell id -nu)
 UPLOAD_HOST_LOGIN     ?= root
 UPLOAD_HOST           ?= www.jannet.de
-UPLOAD_FILE_ROOT      ?= /srv/www/jannet.de_443/proj/$(UPLOAD_MODULE)
+UPLOAD_VHOST_ROOT     ?= /srv/www/jannet.de_443
+#UPLOAD_TEST_PREFIX    ?=
+UPLOAD_MODULE_PATH    ?= $(UPLOAD_TEST_PREFIX)proj/$(UPLOAD_MODULE)
+UPLOAD_FILE_ROOT      ?= $(UPLOAD_VHOST_ROOT)/$(UPLOAD_MODULE_PATH)
 UPLOAD_TARGET_PREFIX  ?= rsync_ssh://$(UPLOAD_HOST_LOGIN)@$(UPLOAD_HOST):$(UPLOAD_FILE_ROOT)/
-UPLOAD_FILES          ?= 
+UPLOAD_LAST_VERSION_FILE ?= LAST_UPLOADED_VERSION
+UPLOAD_LAST_VERSION   ?= $(shell $(CAT) $(UPLOAD_LAST_VERSION_FILE) 2>/dev/null)
+#UPLOAD_FILES          ?=
 REMOTE_TARGETS        ?= \
 	$(foreach f,$(UPLOAD_FILES),$(UPLOAD_TARGET_PREFIX)$f:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP))
 
+ifneq ($(wildcard CVS),)
+  UPLOAD_SCM           = cvs
+else
+  UPLOAD_SCM           = git
+endif
+
+all:
+
+rsync_ssh\://% ftp\://% scp\://%:
+	make $(shell echo $(notdir $@) | $(SED) 's/:.*//g')
+	$(UPLOAD_SH) $(shell echo $(notdir $@) $@ | $(SED) 's/:.*//g') $@
diff --git a/make/upload.mk b/make/upload.mk
index 70304d49..8cdf70f8 100644
--- a/make/upload.mk
+++ b/make/upload.mk
@@ -1,36 +1,8 @@
-UPLOAD_SH             ?= /bin/bash $(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_VHOST_ROOT     ?= /srv/www/jannet.de_443
-#UPLOAD_TEST_PREFIX    ?=
-UPLOAD_MODULE_PATH    ?= $(UPLOAD_TEST_PREFIX)proj/$(UPLOAD_MODULE)
-UPLOAD_FILE_ROOT      ?= $(UPLOAD_VHOST_ROOT)/$(UPLOAD_MODULE_PATH)
-UPLOAD_TARGET_PREFIX  ?= rsync_ssh://$(UPLOAD_HOST_LOGIN)@$(UPLOAD_HOST):$(UPLOAD_FILE_ROOT)/
-UPLOAD_LAST_VERSION_FILE ?= LAST_UPLOADED_VERSION
-UPLOAD_LAST_VERSION   ?= $(shell $(CAT) $(UPLOAD_LAST_VERSION_FILE) 2>/dev/null)
-#UPLOAD_FILES          ?= 
-REMOTE_TARGETS        ?= \
-	$(foreach f,$(UPLOAD_FILES),$(UPLOAD_TARGET_PREFIX)$f:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP))
-
-ifneq ($(wildcard CVS),)
-UPLOAD_SCM = cvs
-else
-UPLOAD_SCM = git
-endif
+include $(MODDIR)/make/upload-defs.mk
 
 all:
 upload: upload.dist
 
-rsync_ssh\://% ftp\://% scp\://%:
-	make $(shell echo $(notdir $@) | $(SED) 's/:.*//g')
-	$(UPLOAD_SH) $(shell echo $(notdir $@) $@ | $(SED) 's/:.*//g') $@
-
 upload.dist: $(UPLOAD_FILES)
 ifneq ($(UPLOAD_LAST_VERSION),$(VERSION))
 	make $(REMOTE_TARGETS)