diff --git a/make/defs.mk b/make/defs.mk
index 12dc3be6..1c1aa1f1 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -497,12 +497,12 @@ INSTALLED_CGI         += $(addprefix $(INSTALL_CGIDIR)/,$(EXE_CGI))
 # -- HTML
 INSTALLATION_FILE_TYPES += HTML
 BUILD_HTMLDIR          = $(TOPDIR)/htdocs
-LOCAL_HTML            += $(filter-out $(DONT_INSTALL),$(wildcard *.html *.css *.php *.js) $(FONTS) $(IMAGES))
+LOCAL_HTML            += $(filter-out $(DONT_INSTALL),$(wildcard *.html *.css *.php *.js *.cgi) $(FONTS) $(IMAGES))
 HTML_SUBDIR           ?= $(shell $(PWD) | $(SED) '/.*\/htdocs\(\/\|$$\)/!d; s%.*/htdocs\(/\|$$\)%%')
 ifeq ($(HTML_SUBDIR),)
-INSTALL_HTMLDIR        = $(PROJECT_HTMLDIR)
+INSTALL_HTMLDIR       ?= $(PROJECT_HTMLDIR)
 else
-INSTALL_HTMLDIR        = $(PROJECT_HTMLDIR)/$(HTML_SUBDIR)
+INSTALL_HTMLDIR       ?= $(PROJECT_HTMLDIR)/$(HTML_SUBDIR)
 endif
 INSTALLED_HTML        += $(addprefix $(INSTALL_HTMLDIR)/,$(LOCAL_HTML))