diff --git a/make/Makefile b/make/Makefile
index 5bf56c32..ee4672f1 100644
--- a/make/Makefile
+++ b/make/Makefile
@@ -7,7 +7,7 @@ TOPDIR = ..
 
 CACHED_FILES      := defs.mk projects.mk platform.mk Makefile
 #CACHED_VARS        = $(shell sed '/^[ \t]*\([A-Z_]\+\) *\(.=\).*$$.shell/!d; s/ *.=.*//' $(CACHED_FILES))
-CACHED_VARS       := WHICH BROWSER SED RM PWD ID CUT TR AWK GETENT XARGS FIND PRINTF HOST_TUPLE OS_NAME_VERSION OS_NAME CAT BIN_INSTALL SUDO
+CACHED_VARS       := WHICH ECHO TEST BROWSER SED RM PWD ID CUT TR AWK GETENT XARGS FIND PRINTF HOST_TUPLE OS_NAME_VERSION OS_NAME CAT BIN_INSTALL SUDO
 #CACHED_VARS       += TARGET_ARCH RPM_ARCH
 CACHED_VARS       += TARGET_ARCH
 #CACHED_VARS       += DEVELOPMENT
diff --git a/make/defs-dev.mk b/make/defs-dev.mk
index 031f43b7..3ab172a2 100644
--- a/make/defs-dev.mk
+++ b/make/defs-dev.mk
@@ -50,20 +50,20 @@ SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d
 CGI_DIR          ?= $(PROJECT_HTMLDIR)/cgi-bin
 
 # -- misc
-LOGID            ?= $(shell id -un | cut -c1-2)-$(PROJECT)
-DAEMON_RUN_USER  ?= $(shell id -un)
-DAEMON_RUN_GROUP ?= $(shell id -gn)
+LOGID            ?= $(shell $(ECHO) $(BUILD_USER) | cut -c1-2)-$(PROJECT)
+DAEMON_RUN_USER  ?= $(BUILD_USER)
+DAEMON_RUN_GROUP ?= $(BUILD_GROUP)
 CATCH_ONLY_YERROR?= true
 
 # -- file attributes
-EXEOWNER         ?= $(shell id -un)
-EXEGROUP         ?= $(shell id -gn)
+EXEOWNER         ?= $(BUILD_USER)
+EXEGROUP         ?= $(BUILD_GROUP)
 EXEMODE          ?= 770
-EXEDIROWNER      ?= $(shell id -un)
-EXEDIRGROUP      ?= $(shell id -gn)
+EXEDIROWNER      ?= $(BUILD_USER)
+EXEDIRGROUP      ?= $(BUILD_GROUP)
 EXEDIRMODE       ?= 755
-CFGOWNER         ?= $(shell id -un)
-CFGGROUP         ?= $(shell id -gn)
+CFGOWNER         ?= $(BUILD_USER)
+CFGGROUP         ?= $(BUILD_GROUP)
 CFGMODE          ?= 660
 CFGDIROWNER      ?= $(EXEDIROWNER)
 CFGDIRGROUP      ?= $(EXEDIRGROUP)
@@ -74,8 +74,8 @@ SYSCFGMODE       ?= $(CFGMODE)
 SYSCFGDIROWNER   ?= $(CFGDIROWNER)
 SYSCFGDIRGROUP   ?= $(CFGDIRGROUP)
 SYSCFGDIRMODE    ?= $(CFGDIRMODE)
-HDROWNER         ?= $(shell id -un)
-HDRGROUP         ?= $(shell id -gn)
+HDROWNER         ?= $(BUILD_USER)
+HDRGROUP         ?= $(BUILD_GROUP)
 HDRMODE          ?= 644
 HDRDIROWNER      ?= $(EXEDIROWNER)
 HDRDIRGROUP      ?= $(EXEDIRGROUP)
@@ -92,11 +92,11 @@ SCRIPTMODE       ?= $(EXEMODE)
 SCRIPTDIROWNER   ?= $(EXEDIROWNER)
 SCRIPTDIRGROUP   ?= $(EXEDIRGROUP)
 SCRIPTDIRMODE    ?= $(EXEDIRMODE)
-PYMODOWNER       ?= $(shell id -un)
-PYMODGROUP       ?= $(shell id -gn)
+PYMODOWNER       ?= $(BUILD_USER)
+PYMODGROUP       ?= $(BUILD_GROUP)
 PYMODMODE        ?= 644
-PYMODDIROWNER    ?= $(shell id -un)
-PYMODDIRGROUP    ?= $(shell id -gn)
+PYMODDIROWNER    ?= $(BUILD_USER)
+PYMODDIRGROUP    ?= $(BUILD_GROUP)
 PYMODDIRMODE     ?= 755
 INITOWNER        ?= $(EXEOWNER)
 INITGROUP        ?= $(EXEGROUP)
@@ -110,17 +110,17 @@ CGIMODE          ?= $(EXEMODE)
 CGIDIROWNER      ?= $(EXEDIROWNER)
 CGIDIRGROUP      ?= $(EXEDIRGROUP)
 CGIDIRMODE       ?= $(EXEDIRMODE)
-HTMLOWNER        ?= $(shell id -un)
-HTMLGROUP        ?= $(shell id -gn)
+HTMLOWNER        ?= $(BUILD_USER)
+HTMLGROUP        ?= $(BUILD_GROUP)
 HTMLMODE         ?= 644
-HTMLDIROWNER     ?= $(shell id -un)
-HTMLDIRGROUP     ?= $(shell id -gn)
+HTMLDIROWNER     ?= $(BUILD_USER)
+HTMLDIRGROUP     ?= $(BUILD_GROUP)
 HTMLDIRMODE      ?= 755
-SYSTEMDOWNER     ?= $(shell id -un)
-SYSTEMDGROUP     ?= $(shell id -gn)
+SYSTEMDOWNER     ?= $(BUILD_USER)
+SYSTEMDGROUP     ?= $(BUILD_GROUP)
 SYSTEMDMODE      ?= 644
-SYSTEMDDIROWNER  ?= $(shell id -un)
-SYSTEMDDIRGROUP  ?= $(shell id -gn)
+SYSTEMDDIROWNER  ?= $(BUILD_USER)
+SYSTEMDDIRGROUP  ?= $(BUILD_GROUP)
 SYSTEMDDIRMODE   ?= 755
 LIBOWNER         ?= $(EXEOWNER)
 LIBGROUP         ?= $(EXEGROUP)
@@ -143,14 +143,14 @@ MAKEDIRMODE      ?= $(HDRDIRMODE)
 PROFILEOWNER     ?= $(EXEOWNER)
 PROFILEGROUP     ?= $(EXEGROUP)
 PROFILEMODE      ?= $(EXEMODE)
-PROFILEDIROWNER  ?= $(shell id -un)
-PROFILEDIRGROUP  ?= $(shell id -gn)
+PROFILEDIROWNER  ?= $(BUILD_USER)
+PROFILEDIRGROUP  ?= $(BUILD_GROUP)
 PROFILEDIRMODE   ?= 770
-ROOTOWNER        ?= $(shell id -un)
-ROOTGROUP        ?= $(shell id -gn)
+ROOTOWNER        ?= $(BUILD_USER)
+ROOTGROUP        ?= $(BUILD_GROUP)
 ROOTMODE         ?= 770
-ROOTDIROWNER     ?= $(shell id -un)
-ROOTDIRGROUP     ?= $(shell id -gn)
+ROOTDIROWNER     ?= $(BUILD_USER)
+ROOTDIRGROUP     ?= $(BUILD_GROUP)
 ROOTDIRMODE      ?= 750
 DOCOWNER         ?= $(HDROWNER)
 DOCGROUP         ?= $(HDRGROUP)
@@ -164,11 +164,11 @@ TMPLMODE         ?= $(DOCMODE)
 TMPLDIROWNER     ?= $(DOCDIROWNER)
 TMPLDIRGROUP     ?= $(DOCDIRGROUP)
 TMPLDIRMODE      ?= $(DOCDIRMODE)
-VAROWNER         ?= $(shell id -un)
-VARGROUP         ?= $(shell id -gn)
+VAROWNER         ?= $(BUILD_USER)
+VARGROUP         ?= $(BUILD_GROUP)
 VARMODE          ?= 666
-VARDIROWNER      ?= $(shell id -un)
-VARDIRGROUP      ?= $(shell id -gn)
+VARDIROWNER      ?= $(BUILD_USER)
+VARDIRGROUP      ?= $(BUILD_GROUP)
 VARDIRMODE       ?= 770
 PREFIXOWNER      ?= $(EXEOWNER)
 PREFIXGROUP      ?= $(EXEGROUP)
@@ -176,17 +176,17 @@ PREFIXMODE       ?= 770
 PREFIXDIROWNER   ?= $(EXEDIROWNER)
 PREFIXDIRGROUP   ?= $(EXEDIRGROUP)
 PREFIXDIRMODE    ?= 770
-IMGOWNER         ?= $(shell id -un)
-IMGGROUP         ?= $(shell id -gn)
+IMGOWNER         ?= $(BUILD_USER)
+IMGGROUP         ?= $(BUILD_GROUP)
 IMGMODE          ?= 666
-IMGDIROWNER      ?= $(shell id -un)
-IMGDIRGROUP      ?= $(shell id -gn)
+IMGDIROWNER      ?= $(BUILD_USER)
+IMGDIRGROUP      ?= $(BUILD_GROUP)
 IMGDIRMODE       ?= 770
-MOOWNER          ?= $(shell id -un)
-MOGROUP          ?= $(shell id -gn)
+MOOWNER          ?= $(BUILD_USER)
+MOGROUP          ?= $(BUILD_GROUP)
 MOMODE           ?= 666
-MODIROWNER       ?= $(shell id -un)
-MODIRGROUP       ?= $(shell id -gn)
+MODIROWNER       ?= $(BUILD_USER)
+MODIRGROUP       ?= $(BUILD_GROUP)
 MODIRMODE        ?= 775
 LOGOWNER         ?= $(DOCOWNER)
 LOGGROUP         ?= $(DOCGROUP)