diff --git a/conf/bash-completion.d/Makefile b/conf/bash-completion.d/Makefile
index a4772e58..8b18976d 100644
--- a/conf/bash-completion.d/Makefile
+++ b/conf/bash-completion.d/Makefile
@@ -1,8 +1,8 @@
-TOPDIR = ../..
+TOPDIR                       = ../..
 
-INSTALL_CFGDIR = $(ENV_PREFIX)/usr/share/bash-completion/completions
-LOCAL_CFG = $(filter-out Makefile,$(wildcard *))
-PACKAGE_INSTALL_DIR = false
+INSTALL_CFGDIR               = $(ROOT_PREFIX)/usr/share/bash-completion/completions
+LOCAL_CFG                    = $(filter-out Makefile,$(wildcard *))
+PACKAGE_INSTALL_DIR          = false
 
 include $(TOPDIR)/make/proj.mk
 include $(JWBDIR)/make/conf.mk
diff --git a/make/defs.mk b/make/defs.mk
index e323de68..12adf33d 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -184,7 +184,7 @@ PKG_VENDOR                  ?= janware GmbH
 # ----- Packaging variables
 
 PKG_SH_EXE                  := /bin/bash $(JWB_SCRIPT_DIR)/pkg.sh
-LOG_INSTALL_SH              := $(PKG_SH_EXE) log-install -f $(PKG_FORMAT)
+LOG_INSTALL_SH              := $(PKG_SH_EXE) log-install
 UPDATE_REPO_SH              := /opt/packager-server/bin/packager-server schedule-rebuild
 
 ifdef INSTALL_LINK
@@ -195,14 +195,14 @@ else ifdef INSTALL_SYMLINK
   LINK_LIB                   = $(SUDO) $(LOG_INSTALL_SH) -LA $(LOG_INSTALL_EXTRA_OPTS)
 else
   ifdef INSTALL_LOG
-    INSTALL                  = $(LOG_INSTALL_SH) -p -l $(INSTALL_LOG) $(LOG_INSTALL_EXTRA_OPTS)
-    LINK_LIB                 = $(LOG_INSTALL_SH) -L -l $(INSTALL_LOG) $(LOG_INSTALL_EXTRA_OPTS)
+    INSTALL                  = $(LOG_INSTALL_SH) -p -l $(INSTALL_LOG) -f $(PKG_FORMAT) $(LOG_INSTALL_EXTRA_OPTS)
+    LINK_LIB                 = $(LOG_INSTALL_SH) -L -l $(INSTALL_LOG) -f $(PKG_FORMAT) $(LOG_INSTALL_EXTRA_OPTS)
   else
     ifndef INSTALL
       ifeq ($(DEVELOPMENT),false)
-        INSTALL              = $(SUDO) install
+        INSTALL              = $(SUDO) $(LOG_INSTALL_SH) -p $(LOG_INSTALL_EXTRA_OPTS)
       else
-        INSTALL              = install
+        INSTALL              = $(LOG_INSTALL_SH)
       endif
     endif
     ifndef LINK_LIB
diff --git a/scripts/pkg.sh b/scripts/pkg.sh
index 30174219..9e24c9ae 100644
--- a/scripts/pkg.sh
+++ b/scripts/pkg.sh
@@ -734,7 +734,7 @@ cmd_log_install()
 	local args="$*"
 
 	local c_format=rpm
-	local c_logfile=install.log
+	local c_logfile=""
 	local c_mode_dir=false
 	local c_create_leading_dirs=false
 	local c_group=`id -gn`
diff --git a/scripts/usr-bin/Makefile b/scripts/usr-bin/Makefile
index 69c37ad1..8c937984 100644
--- a/scripts/usr-bin/Makefile
+++ b/scripts/usr-bin/Makefile
@@ -1,6 +1,6 @@
 TOPDIR = ../..
 
-TARGET_DIR = $(ENV_PREFIX)/usr/bin
+TARGET_DIR = $(ROOT_PREFIX)/usr/bin
 
 include $(TOPDIR)/make/proj.mk
 include $(JWBDIR)/make/defs.mk