diff --git a/make/defs-dev.mk b/make/defs-dev.mk
index 67b61e0b..46a9e0b9 100644
--- a/make/defs-dev.mk
+++ b/make/defs-dev.mk
@@ -12,6 +12,7 @@ EXE_PREFIX       ?= $(PREFIX)
 INIT_PREFIX      ?= $(EXE_PREFIX)
 SYSCONFIG_PREFIX ?= $(PREFIX)/sysconfig
 CONFIG_DIR       ?= $(ENV_PREFIX)/$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT)
+IMG_PREFIX       ?= $(PREFIX)
 
 IMAGEDIR         ?= $(MODDIR)/../../images
 CTRLDIR          ?= $(ENV_PREFIX)/$(HOME)/bin$(FLAVOUR_PATH_SUFFIX)
@@ -23,25 +24,25 @@ WORKING_DIR      ?= $(ENV_PREFIX)/$(HOME)
 WORKING_DIR      ?= $(VAR_PREFIX)/lock
 
 # -- misc
-LOGNAME          ?= $(shell whoami)-$(PROJECT)
-DAEMON_RUN_USER  ?= $(shell whoami)
+LOGNAME          ?= $(shell id -un)-$(PROJECT)
+DAEMON_RUN_USER  ?= $(shell id -un)
 DAEMON_RUN_GROUP ?= $(shell id -gn)
 CATCH_ONLY_YERROR?= true
 
 # -- file attributes
-EXEOWNER         ?= $(shell whoami)
+EXEOWNER         ?= $(shell id -un)
 EXEGROUP         ?= $(shell id -gn)
 EXEMODE          ?= 770
-EXEDIROWNER      ?= $(shell whoami)
+EXEDIROWNER      ?= $(shell id -un)
 EXEDIRGROUP      ?= $(shell id -gn)
 EXEDIRMODE       ?= 755
-CFGOWNER         ?= $(shell whoami)
+CFGOWNER         ?= $(shell id -un)
 CFGGROUP         ?= $(shell id -gn)
 CFGMODE          ?= 660
 CFGDIROWNER      ?= $(EXEDIROWNER)
 CFGDIRGROUP      ?= $(EXEDIRGROUP)
 CFGDIRMODE       ?= $(EXEDIRMODE)
-HDROWNER         ?= $(shell whoami)
+HDROWNER         ?= $(shell id -un)
 HDRGROUP         ?= $(shell id -gn)
 HDRMODE          ?= 644
 HDRDIROWNER      ?= $(EXEDIROWNER)
@@ -86,7 +87,7 @@ MAKEDIRMODE      ?= $(HDRDIRMODE)
 PROFILEOWNER     ?= $(EXEOWNER)
 PROFILEGROUP     ?= $(EXEGROUP)
 PROFILEMODE      ?= $(EXEMODE)
-PROFILEDIROWNER  ?= $(shell whoami)
+PROFILEDIROWNER  ?= $(shell id -un)
 PROFILEDIRGROUP  ?= $(shell id -gn)
 PROFILEDIRMODE   ?= 770
 ROOTOWNER        ?= $(shell id -un)
@@ -104,8 +105,8 @@ DOCDIRMODE       ?= $(HDRDIRMODE)
 VAROWNER         ?= $(shell id -un)
 VARGROUP         ?= $(shell id -gn)
 VARMODE          ?= 666
-VARDIROWNER      ?= $(shell id -gn)
-VARDIRGROUP      ?= $(shell whoami)
+VARDIROWNER      ?= $(shell id -un)
+VARDIRGROUP      ?= $(shell id -gn)
 VARDIRMODE       ?= 770
 PREFIXOWNER      ?= $(EXEOWNER)
 PREFIXGROUP      ?= $(EXEGROUP)
@@ -113,6 +114,12 @@ PREFIXMODE       ?= 770
 PREFIXDIROWNER   ?= $(EXEDIROWNER)
 PREFIXDIRGROUP   ?= $(EXEDIRGROUP)
 PREFIXDIRMODE    ?= 770
+IMGOWNER         ?= $(shell id -un)
+IMGGROUP         ?= $(shell id -gn)
+IMGMODE          ?= 666
+IMGDIROWNER      ?= $(shell id -un)
+IMGDIRGROUP      ?= $(shell id -gn)
+IMGDIRMODE       ?= 770
 
 # -- options
 
diff --git a/make/defs-dist.mk b/make/defs-dist.mk
index 217e73fc..fe4dc2e6 100644
--- a/make/defs-dist.mk
+++ b/make/defs-dist.mk
@@ -12,6 +12,7 @@ EXE_PREFIX       ?= $(PREFIX)
 INIT_PREFIX      ?= $(ENV_PREFIX)/etc$(FLAVOUR_PATH_SUFFIX)
 SYSCONFIG_PREFIX ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig
 CONFIG_DIR       ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT)
+IMG_PREFIX       ?= $(PREFIX)
 
 IMAGEDIR         ?= $(FLAVOUR_PATH_PREFIX)$(PREFIX)/images
 CTRLDIR          ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)init.d
@@ -114,6 +115,12 @@ PREFIXMODE       ?= 644
 PREFIXDIROWNER   ?= $(EXEOWNER)
 PREFIXDIRGROUP   ?= $(EXEGROUP)
 PREFIXDIRMODE    ?= 755
+IMGOWNER         ?= $(DOCOWNER)
+IMGGROUP         ?= $(DOCGROUP)
+IMGMODE          ?= $(DOCMODE)
+IMGDIROWNER      ?= $(DOCDIROWNER)
+IMGDIRGROUP      ?= $(DOCDIROWNER)
+IMGDIRMODE       ?= $(DOCDIRMODE)
 
 # -- options