diff --git a/make/defs-dev.mk b/make/defs-dev.mk
index b679e0fd..848ccdf5 100644
--- a/make/defs-dev.mk
+++ b/make/defs-dev.mk
@@ -39,7 +39,7 @@ DOWNLOADDIRS     ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443
 WORKING_DIR      ?= $(ENV_PREFIX)$(HOME)
 WORKING_DIR      ?= $(VAR_PREFIX)/lock
 JAVADIR          ?= $(JAVA_PREFIX)/share/java
-HTML_PROJECT     ?= $(patsubst www-%,%,$(PROJECT))
+HTML_PROJECT     ?= $(patsubst www-%,%,$(PROJECT_DIRNAME))
 PROJECT_HTML_BASE_DIR  ?= $(HTDOCS_PREFIX)/proj
 PROJECT_HTMLDIR  ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT)
 PROJECT_HTML_THEMES_DIR  ?= $(PROJECT_HTML_BASE_DIR)/themes
diff --git a/make/defs-dist.mk b/make/defs-dist.mk
index d2df46e1..030bf6a0 100644
--- a/make/defs-dist.mk
+++ b/make/defs-dist.mk
@@ -39,7 +39,7 @@ DOWNLOADDIRS     ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443
 WORKING_DIR      ?= $(VAR_PREFIX)/coredumps
 WORKING_DIR      ?= $(VAR_PREFIX)/lock
 JAVADIR          ?= $(JAVA_PREFIX)/share/java
-HTML_PROJECT     ?= $(patsubst www-%,%,$(PROJECT))
+HTML_PROJECT     ?= $(patsubst www-%,%,$(PROJECT_DIRNAME))
 PROJECT_HTML_BASE_DIR  ?= $(HTDOCS_PREFIX)/proj
 PROJECT_HTMLDIR  ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT)
 PROJECT_HTML_THEMES_DIR  ?= $(PROJECT_HTML_BASE_DIR)/themes