diff --git a/make/defs-dev.mk b/make/defs-dev.mk
index f1bfd869..c54fb729 100644
--- a/make/defs-dev.mk
+++ b/make/defs-dev.mk
@@ -46,7 +46,7 @@ PROJECT_HTMLDIR  ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT)
 PROJECT_HTML_THEMES_DIR  ?= $(PROJECT_HTML_BASE_DIR)/themes
 PROJECT_TMPLDIR  ?= $(PREFIX)/tmpl
 SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d
-CGI_DIR          ?= $(HTDOCS_PREFIX)/cgi-bin
+CGI_DIR          ?= $(PROJECT_HTMLDIR)/cgi-bin
 
 # -- misc
 LOGID            ?= $(shell id -un | cut -c1-2)-$(PROJECT)
diff --git a/make/defs-dist.mk b/make/defs-dist.mk
index 875d44d3..73da838d 100644
--- a/make/defs-dist.mk
+++ b/make/defs-dist.mk
@@ -46,7 +46,7 @@ PROJECT_HTMLDIR  ?= $(PROJECT_HTML_BASE_DIR)/$(HTML_PROJECT)
 PROJECT_HTML_THEMES_DIR  ?= $(PROJECT_HTML_BASE_DIR)/themes
 PROJECT_TMPLDIR  ?= $(PREFIX)/share/tmpl
 SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d
-CGI_DIR          ?= $(HTDOCS_PREFIX)/cgi-bin
+CGI_DIR          ?= $(PROJECT_HTMLDIR)/cgi-bin
 
 # -- misc
 LOGID            ?= $(PROJECT)