diff --git a/make/doxygen.mk b/make/doxygen.mk
index 33f30e53..99dfb9d6 100644
--- a/make/doxygen.mk
+++ b/make/doxygen.mk
@@ -15,7 +15,7 @@ UPLOAD_DIR_MODE       ?= 755
 
 include $(MODDIR)/make/upload-defs.mk
 
-UPLOAD_URL                  ?= $(UPLOAD_URL_DEVEL_DOC)/$(PROJECT)/doxygen:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP)
+UPLOAD_URL                  ?= $(UPLOAD_URL_DEVEL_DOC)/$(PROJECT)/doxygen/:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP)
 UNTEMPLATED                  = $(patsubst %.tmpl,%,$(wildcard *.tmpl))
 OUTPUT_DIR                  ?= html
 INSTALL_DOXYGEN_DIR         ?= $(DOC_PREFIX)/devel
@@ -38,10 +38,11 @@ html: doxygen.done cpfiles.done
 		| sed "s/__PROJECT__/$(PROJECT)/" \
 		| sed "s/__PROJECT_CAPNAME__/$(PROJECT_CAPNAME)/" \
 		| sed "s/__OUTPUT_DIR__/$(OUTPUT_DIR)/" \
+		| sed "s%__PROJECT_TOPDIR__%$(TOPDIR)%" \
 	> $@
 
 doxygen.done: $(UNTEMPLATED)
-	doxygen $(DOXYGEN_CONF)
+	umask 022; doxygen $(DOXYGEN_CONF)
 	touch $@
 
 cpfiles.done: doxygen.done $(DOC_FILES) 
@@ -55,7 +56,7 @@ view: doc.done
 	konqueror $(OUTPUT_DIR)/index.html
 
 upload.done: doxygen.done cpfiles.done
-	upload.sh $(OUTPUT_DIR) $(UPLOAD_URL)
+	upload.sh $(OUTPUT_DIR)/ $(UPLOAD_URL)
 
 clean.doxygen:
 	rm -rf $(OUTPUT_DIR) *.done $(UNTEMPLATED)