diff --git a/make/defs-dist.mk b/make/defs-dist.mk
index c5d8af94..9931f1cd 100644
--- a/make/defs-dist.mk
+++ b/make/defs-dist.mk
@@ -8,17 +8,18 @@
 PREFIX           ?= $(ENV_PREFIX)/opt/$(PROJECT)
 VAR_PREFIX       ?= $(ENV_PREFIX)/var/opt
 DOC_PREFIX       ?= $(ENV_PREFIX)/usr/share/doc/packages/$(PROJECT)
+EXE_PREFIX       ?= $(PREFIX)
+SYSCONFIG_PREFIX ?= $(ENV_PREFIX)/etc/sysconfig
+CONFIG_DIR       ?= /etc/opt/$(PROJECT)
 
-# dunno if this is cool, see defs-dist.mk
 IMAGEDIR         ?= $(PREFIX)/images
 CTRLDIR          ?= $(ENV_PREFIX)/etc/init.d
+DAEMON_RUN_DIR   ?= $(VAR_PREFIX)/corefiles
 PROFILE_DIR      ?= $(ENV_PREFIX)/etc/profile.d
 PIDDIR           ?= $(VAR_PREFIX)/run
-DAEMON_RUN_DIR   ?= $(VAR_PREFIX)/corefiles
 DOWNLOADDIRS     ?= root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/$(CUSTOMER)/projects/$(PROJECT)
-CONFIG_DIR       ?= $(PREFIX)/etc
-
-CONFIG_FILE      ?= $(CONFIG_DIR)/$(PROJECT).conf
+WORKING_DIR      ?= $(VAR_PREFIX)/coredumps
+WORKING_DIR      ?= $(VAR_PREFIX)/lock
 
 # -- misc
 LOGNAME          ?= $(PROJECT)
@@ -28,38 +29,42 @@ DAEMON_RUN_GROUP ?= root
 # -- file attributes
 EXEGROUP         ?= root
 EXEOWNER         ?= root
-EXEMODE          ?= 770
+EXEMODE          ?= 750
 CFGGROUP         ?= root
 CFGOWNER         ?= root
 CFGMODE          ?= 660
-CTRLGROUP        ?= root
-CTRLOWNER        ?= root
-CTRLMODE         ?= 770
-INITGROUP        ?= root
-INITOWNER        ?= root
-INITMODE         ?= 770
-LIBGROUP         ?= root
-LIBOWNER         ?= root
-LIBMODE          ?= 770
 HDRGROUP         ?= root
 HDROWNER         ?= root
 HDRMODE          ?= 644
-MAKEOWNER        ?= root
-MAKEGROUP        ?= root
-MAKEMODE         ?= 644
-PROFILEGROUP     ?= root
-PROFILEOWNER     ?= root
-PROFILEMODE      ?= 755
+CTRLGROUP        ?= $(EXEGROUP)
+CTRLOWNER        ?= $(EXEOWNER)
+CTRLMODE         ?= $(EXEMODE)
+INITGROUP        ?= $(EXEGROUP)
+INITOWNER        ?= $(EXEOWNER)
+INITMODE         ?= $(EXEMODE)
+LIBGROUP         ?= $(EXEGROUP)
+LIBOWNER         ?= $(EXEOWNER)
+LIBMODE          ?= $(EXEMODE)
+MAKEOWNER        ?= $(HDROWNER)
+MAKEGROUP        ?= $(HDRGROUP)
+MAKEMODE         ?= $(HDRMODE)
+PROFILEGROUP     ?= $(EXEGROUP)
+PROFILEOWNER     ?= $(EXEOWNER)
+PROFILEMODE      ?= $(EXEMODE)
 PROFILEDIRGROUP  ?= root
 PROFILEDIROWNER  ?= root
 PROFILEDIRMODE   ?= 755
-DAEMON_RUN_USER  ?= root
-DAEMON_RUN_GROUP ?= root
 ROOTOWNER        ?= root
 ROOTGROUP        ?= root
 DOCMODE          ?= $(HDRMODE)
 DOCOWNER         ?= $(HDROWNER)
 DOCGROUP         ?= $(HDRGROUP)
+VARDIRGROUP      ?= root
+VARDIROWNER      ?= root
+VARDIRMODE       ?= 770
+PREFIXDIRGROUP   ?= $(EXEGROUP)
+PREFIXDIROWNER   ?= $(EXEOWNER)
+PREFIXDIRMODE    ?= 755
 
 # -- options