diff --git a/make/defs-dev.mk b/make/defs-dev.mk
index e2fe5348..472d8edc 100644
--- a/make/defs-dev.mk
+++ b/make/defs-dev.mk
@@ -10,6 +10,7 @@ VAR_PREFIX       ?= $(PREFIX)/var
 DOC_PREFIX       ?= $(PREFIX)/doc/$(PROJECT)
 EXE_PREFIX       ?= $(PREFIX)
 INIT_PREFIX      ?= $(EXE_PREFIX)
+CGI_DIR          ?= $(PREFIX)/cgi-bin
 SYSCFG_DIR       ?= $(PREFIX)/sysconfig
 CONFIG_DIR       ?= $(ENV_PREFIX)$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT)
 LD_CONF_DIR      ?= $(ENV_PREFIX)$(HOME)/etc/ld.so.conf.d
@@ -76,6 +77,12 @@ INITMODE         ?= $(EXEMODE)
 INITDIROWNER     ?= $(EXEDIROWNER)
 INITDIRGROUP     ?= $(EXEDIRGROUP)
 INITDIRMODE      ?= $(EXEDIRMODE)
+CGIOWNER         ?= $(EXEOWNER)
+CGIGROUP         ?= $(EXEGROUP)
+CGIMODE          ?= $(EXEMODE)
+CGIDIROWNER      ?= $(EXEDIROWNER)
+CGIDIRGROUP      ?= $(EXEDIRGROUP)
+CGIDIRMODE       ?= $(EXEDIRMODE)
 LIBOWNER         ?= $(EXEOWNER)
 LIBGROUP         ?= $(EXEGROUP)
 LIBMODE          ?= $(EXEMODE)
diff --git a/make/defs-dist.mk b/make/defs-dist.mk
index 49bb1058..221b3bcf 100644
--- a/make/defs-dist.mk
+++ b/make/defs-dist.mk
@@ -10,6 +10,7 @@ VAR_PREFIX       ?= $(ENV_PREFIX)/var/$(FLAVOUR_PATH_PREFIX)opt
 DOC_PREFIX       ?= $(ENV_PREFIX)/usr/share/doc/packages/$(FLAVOUR_PREFIX)$(PROJECT)
 EXE_PREFIX       ?= $(PREFIX)
 INIT_PREFIX      ?= $(ENV_PREFIX)/etc$(FLAVOUR_PATH_SUFFIX)
+CGI_DIR          ?= $(ENV_PREFIX)/home/wwwrun/local/cgi-bin
 SYSCFG_DIR       ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig
 CONFIG_DIR       ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT)
 LD_CONF_DIR      ?= $(ENV_PREFIX)/etc/ld.so.conf.d
@@ -77,6 +78,12 @@ INITMODE         ?= $(EXEMODE)
 INITDIROWNER     ?= $(EXEDIROWNER)
 INITDIRGROUP     ?= $(EXEDIRGROUP)
 INITDIRMODE      ?= $(EXEDIRMODE)
+CGIOWNER         ?= $(EXEOWNER)
+CGIGROUP         ?= $(EXEGROUP)
+CGIMODE          ?= $(EXEMODE)
+CGIDIROWNER      ?= $(EXEDIROWNER)
+CGIDIRGROUP      ?= $(EXEDIRGROUP)
+CGIDIRMODE       ?= $(EXEDIRMODE)
 LIBOWNER         ?= $(EXEOWNER)
 LIBGROUP         ?= $(EXEGROUP)
 LIBMODE          ?= $(EXEMODE)
diff --git a/make/defs.mk b/make/defs.mk
index 7dd2276e..8a459261 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -297,6 +297,15 @@ INSTALL_SCRIPTDIR      = $(EXE_PREFIX)/bin
 BUILD_SCRIPT          += $(addprefix $(BUILD_SCRIPTDIR)/,$(EXE_SH))
 INSTALLED_SCRIPT      += $(addprefix $(INSTALL_EXEDIR)/,$(EXE_SH))
 
+# -- CGI
+EXE_CGI               += $(wildcard *.cgi)
+EXE_CGI               += $(patsubst %.cgi.tmpl,%.cgi,$(wildcard *.cgi.tmpl))
+
+BUILD_CGIDIR           = $(TOPDIR)/bin
+INSTALL_CGIDIR         = $(CGI_DIR)
+BUILD_CGI             += $(addprefix $(BUILD_CGIDIR)/,$(EXE_CGI))
+INSTALLED_CGI         += $(addprefix $(INSTALL_CGIDIR)/,$(EXE_CGI))
+
 # -- INIT
 BUILD_INITDIR          = $(TOPDIR)/bin
 INSTALL_INITDIR        = $(INIT_PREFIX)/init.d
diff --git a/make/rules.mk b/make/rules.mk
index d1c8da13..24cbe75f 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -250,7 +250,7 @@ check_not_empty_$(1):
 	fi
 endef
 
-INSTALLATION_FILE_TYPES = LIB PI HDR EXE SCRIPT INIT DOC PROFILE MAKE CFG SYSCFG IMG LOG JAVA LD_CONF
+INSTALLATION_FILE_TYPES = LIB PI HDR EXE SCRIPT INIT DOC PROFILE MAKE CFG SYSCFG IMG LOG JAVA LD_CONF CGI
 
 #$(foreach attr,OWNER GROUP MODE,$(foreach type, $(INSTALLATION_FILE_TYPES),\
 #	$(eval $(call std_install_rules,$(type)$(attr)))))