diff --git a/make/crosstool.mk b/make/crosstool.mk
index d0ae3f90..2be29df8 100644
--- a/make/crosstool.mk
+++ b/make/crosstool.mk
@@ -97,7 +97,7 @@ ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd2 hd51 bre2ze4k))
 endif
 	$(CHDIR)/$(CROSSTOOL-NG_TMP); \
 		unset CONFIG_SITE LIBRARY_PATH CPATH C_INCLUDE_PATH PKG_CONFIG_PATH CPLUS_INCLUDE_PATH INCLUDE; \
-		install -m 0644 $(CONFIGS)/ct-ng-$(BOXTYPE)-$(BOXSERIES).config .config; \
+		$(INSTALL_DATA) $(CONFIGS)/ct-ng-$(BOXTYPE)-$(BOXSERIES).config .config; \
 		sed -i "s|^CT_PARALLEL_JOBS=.*|CT_PARALLEL_JOBS=$(PARALLEL_JOBS)|" .config; \
 		export NI_LOCAL_TARBALLS_DIR=$(ARCHIVE); \
 		export NI_PREFIX_DIR=$@; \
diff --git a/make/environment-build.mk b/make/environment-build.mk
index be08365d..f43a031a 100644
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@@ -307,6 +307,10 @@ MKDIR = mkdir -p $(BUILD_TMP)
 CPDIR = cp -a -t $(BUILD_TMP) $(ARCHIVE)
 TOUCH = @touch $@
 
+INSTALL      = install
+INSTALL_DATA = $(INSTALL) -m 0644
+INSTALL_EXEC = $(INSTALL) -m 0755
+
 # empty variable EMPTY for smoother comparisons
 EMPTY =
 
diff --git a/make/host-tools.mk b/make/host-tools.mk
index dbef6458..a9842d9f 100644
--- a/make/host-tools.mk
+++ b/make/host-tools.mk
@@ -45,7 +45,7 @@ $(HOST_DIR)/bin/pkg-config: $(ARCHIVE)/$(HOST_PKG-CONFIG_SOURCE) | $(HOST_DIR)/b
 			--with-pc_path=$(PKG_CONFIG_PATH) \
 			; \
 		$(MAKE); \
-		install -D -m 0755 pkg-config $(HOST_DIR)/bin
+		$(INSTALL_EXEC) -D pkg-config $(HOST_DIR)/bin
 	$(REMOVE)/$(HOST_PKG-CONFIG_TMP)
 
 host-pkg-config-link: $(HOST_DIR)/bin/$(TARGET)-pkg-config
@@ -76,7 +76,7 @@ $(HOST_DIR)/bin/pkgconf: $(ARCHIVE)/$(HOST_PKGCONF_SOURCE) | $(HOST_DIR)/bin pkg
 			; \
 		$(MAKE); \
 		$(MAKE) install
-	install -m 0755 $(PATCHES)/pkgconf-pkg-config $(HOST_DIR)/bin/pkg-config
+	$(INSTALL_EXEC) $(PATCHES)/pkgconf-pkg-config $(HOST_DIR)/bin/pkg-config
 	$(REMOVE)/$(HOST_PKGCONF_TMP)
 
 # -----------------------------------------------------------------------------
@@ -107,8 +107,8 @@ $(HOST_DIR)/bin/sumtool: $(ARCHIVE)/$(HOST_MTD-UTILS_SOURCE) | $(HOST_DIR)/bin
 			--disable-tests \
 			; \
 		$(MAKE)
-	install -D -m 0755 $(BUILD_TMP)/$(HOST_MTD-UTILS_TMP)/mkfs.jffs2 $(HOST_DIR)/bin/
-	install -D -m 0755 $(BUILD_TMP)/$(HOST_MTD-UTILS_TMP)/sumtool $(HOST_DIR)/bin/
+	$(INSTALL_EXEC) -D $(BUILD_TMP)/$(HOST_MTD-UTILS_TMP)/mkfs.jffs2 $(HOST_DIR)/bin/
+	$(INSTALL_EXEC) -D $(BUILD_TMP)/$(HOST_MTD-UTILS_TMP)/sumtool $(HOST_DIR)/bin/
 	$(REMOVE)/$(HOST_MTD-UTILS_TMP)
 
 # -----------------------------------------------------------------------------
@@ -129,7 +129,7 @@ $(HOST_DIR)/bin/mkimage: $(ARCHIVE)/$(HOST_U-BOOT_SOURCE) | $(HOST_DIR)/bin
 		$(MAKE) defconfig; \
 		$(MAKE) silentoldconfig; \
 		$(MAKE) tools-only
-	install -D -m 0755 $(BUILD_TMP)/$(HOST_U-BOOT_TMP)/tools/mkimage $(HOST_DIR)/bin/
+	$(INSTALL_EXEC) -D $(BUILD_TMP)/$(HOST_U-BOOT_TMP)/tools/mkimage $(HOST_DIR)/bin/
 	$(REMOVE)/$(HOST_U-BOOT_TMP)
 
 # -----------------------------------------------------------------------------
@@ -160,7 +160,7 @@ $(HOST_ZIC): $(ARCHIVE)/$(HOST_TZDATA_SOURCE) $(ARCHIVE)/$(HOST_TZCODE_SOURCE) |
 		tar -xf $(ARCHIVE)/$(HOST_TZCODE_SOURCE); \
 		tar -xf $(ARCHIVE)/$(HOST_TZDATA_SOURCE); \
 		$(MAKE) zic
-	install -D -m 0755 $(BUILD_TMP)/$(HOST_TZCODE_TMP)/zic $(HOST_DIR)/bin/
+	$(INSTALL_EXEC) -D $(BUILD_TMP)/$(HOST_TZCODE_TMP)/zic $(HOST_DIR)/bin/
 	$(REMOVE)/$(HOST_TZCODE_TMP)
 
 # -----------------------------------------------------------------------------
@@ -190,7 +190,7 @@ $(HOST_DIR)/bin/parted: $(ARCHIVE)/$(HOST_PARTED_SOURCE) | $(HOST_DIR)/bin
 			--without-readline \
 			; \
 		$(MAKE)
-	install -D -m 0755 $(BUILD_TMP)/$(HOST_PARTED_TMP)/parted/parted $(HOST_DIR)/bin/
+	$(INSTALL_EXEC) -D $(BUILD_TMP)/$(HOST_PARTED_TMP)/parted/parted $(HOST_DIR)/bin/
 	$(REMOVE)/$(HOST_PARTED_TMP)
 
 # -----------------------------------------------------------------------------
@@ -212,7 +212,7 @@ $(HOST_DIR)/bin/mkfs.fat: $(ARCHIVE)/$(HOST_DOSFSTOOLS_SOURCE) | $(HOST_DIR)/bin
 			--without-udev \
 			; \
 		$(MAKE)
-	install -D -m 0755 $(BUILD_TMP)/$(HOST_DOSFSTOOLS_TMP)/src/mkfs.fat $(HOST_DIR)/bin/
+	$(INSTALL_EXEC) -D $(BUILD_TMP)/$(HOST_DOSFSTOOLS_TMP)/src/mkfs.fat $(HOST_DIR)/bin/
 	ln -sf mkfs.fat $(HOST_DIR)/bin/mkfs.vfat
 	ln -sf mkfs.fat $(HOST_DIR)/bin/mkfs.msdos
 	ln -sf mkfs.fat $(HOST_DIR)/bin/mkdosfs
@@ -235,7 +235,7 @@ $(HOST_DIR)/bin/mtools: $(ARCHIVE)/$(HOST_MTOOLS_SOURCE) | $(HOST_DIR)/bin
 	$(CHDIR)/$(HOST_MTOOLS_TMP); \
 		./configure; \
 		$(MAKE)
-	install -D -m 0755 $(BUILD_TMP)/$(HOST_MTOOLS_TMP)/mtools $(HOST_DIR)/bin/
+	$(INSTALL_EXEC) -D $(BUILD_TMP)/$(HOST_MTOOLS_TMP)/mtools $(HOST_DIR)/bin/
 	ln -sf mtools $(HOST_DIR)/bin/mcopy
 	$(REMOVE)/$(HOST_MTOOLS_TMP)
 
@@ -256,13 +256,13 @@ $(HOST_DIR)/bin/resize2fs: $(ARCHIVE)/$(HOST_E2FSPROGS_SOURCE) | $(HOST_DIR)/bin
 	$(CHDIR)/$(HOST_E2FSPROGS_TMP); \
 		./configure; \
 		$(MAKE)
-	install -D -m 0755 $(BUILD_TMP)/$(HOST_E2FSPROGS_TMP)/resize/resize2fs $(HOST_DIR)/bin/
-	install -D -m 0755 $(BUILD_TMP)/$(HOST_E2FSPROGS_TMP)/misc/mke2fs $(HOST_DIR)/bin/
+	$(INSTALL_EXEC) -D $(BUILD_TMP)/$(HOST_E2FSPROGS_TMP)/resize/resize2fs $(HOST_DIR)/bin/
+	$(INSTALL_EXEC) -D $(BUILD_TMP)/$(HOST_E2FSPROGS_TMP)/misc/mke2fs $(HOST_DIR)/bin/
 	ln -sf mke2fs $(HOST_DIR)/bin/mkfs.ext2
 	ln -sf mke2fs $(HOST_DIR)/bin/mkfs.ext3
 	ln -sf mke2fs $(HOST_DIR)/bin/mkfs.ext4
 	ln -sf mke2fs $(HOST_DIR)/bin/mkfs.ext4dev
-	install -D -m 0755 $(BUILD_TMP)/$(HOST_E2FSPROGS_TMP)/e2fsck/e2fsck $(HOST_DIR)/bin/
+	$(INSTALL_EXEC) -D $(BUILD_TMP)/$(HOST_E2FSPROGS_TMP)/e2fsck/e2fsck $(HOST_DIR)/bin/
 	ln -sf e2fsck $(HOST_DIR)/bin/fsck.ext2
 	ln -sf e2fsck $(HOST_DIR)/bin/fsck.ext3
 	ln -sf e2fsck $(HOST_DIR)/bin/fsck.ext4
diff --git a/make/image-updates.mk b/make/image-updates.mk
index fbbe9176..2496c237 100644
--- a/make/image-updates.mk
+++ b/make/image-updates.mk
@@ -37,10 +37,10 @@ u-neutrino: neutrino-clean
 	echo "killall start_neutrino neutrino; sleep 5"	>> $(PREINSTALL_SH)
 	echo "sync; /bin/busybox reboot"		>> $(POSTINSTALL_SH)
 	$(MAKE) neutrino
-	install -D -m 0755 $(TARGET_DIR)/etc/init.d/start_neutrino $(UPDATE_INST_DIR)/etc/init.d/start_neutrino
-	install -D -m 0755 $(TARGET_DIR)/bin/neutrino $(UPDATE_INST_DIR)/bin/neutrino
-	install -D -m 0644 $(TARGET_SHARE_DIR)/tuxbox/neutrino/locale/deutsch.locale $(UPDATE_INST_DIR)/share/tuxbox/neutrino/locale/deutsch.locale
-	install -D -m 0644 $(TARGET_SHARE_DIR)/tuxbox/neutrino/locale/english.locale $(UPDATE_INST_DIR)/share/tuxbox/neutrino/locale/english.locale
+	$(INSTALL_EXEC) -D $(TARGET_DIR)/etc/init.d/start_neutrino $(UPDATE_INST_DIR)/etc/init.d/start_neutrino
+	$(INSTALL_EXEC) -D $(TARGET_DIR)/bin/neutrino $(UPDATE_INST_DIR)/bin/neutrino
+	$(INSTALL_DATA) -D $(TARGET_SHARE_DIR)/tuxbox/neutrino/locale/deutsch.locale $(UPDATE_INST_DIR)/share/tuxbox/neutrino/locale/deutsch.locale
+	$(INSTALL_DATA) -D $(TARGET_SHARE_DIR)/tuxbox/neutrino/locale/english.locale $(UPDATE_INST_DIR)/share/tuxbox/neutrino/locale/english.locale
 ifneq ($(DEBUG), yes)
 	find $(UPDATE_INST_DIR)/bin -type f ! -name *.sh -print0 | xargs -0 $(TARGET_STRIP) || true
 endif
@@ -54,7 +54,7 @@ u-neutrino-full: neutrino-clean
 	echo "killall start_neutrino neutrino; sleep 5"	>> $(PREINSTALL_SH)
 	echo "sync; /bin/busybox reboot"		>> $(POSTINSTALL_SH)
 	$(MAKE) neutrino N_INST_DIR=$(UPDATE_INST_DIR)
-	install -D -m 0755 $(TARGET_DIR)/etc/init.d/start_neutrino $(UPDATE_INST_DIR)/etc/init.d/start_neutrino
+	$(INSTALL_EXEC) -D $(TARGET_DIR)/etc/init.d/start_neutrino $(UPDATE_INST_DIR)/etc/init.d/start_neutrino
 ifneq ($(DEBUG), yes)
 	find $(UPDATE_INST_DIR)/bin -type f ! -name *.sh -print0 | xargs -0 $(TARGET_STRIP) || true
 endif
@@ -80,19 +80,19 @@ u-update.urls: update.urls
 
 u-pr-auto-timer:
 	$(MAKE) u-init
-	install -m 0755 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/preinstall.sh $(PREINSTALL_SH)
-	install -m 0755 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/postinstall.sh $(POSTINSTALL_SH)
-	install -d $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins
-	install -m 0755 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.sh $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
-	install -m 0644 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.cfg $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
-	install -m 0755 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
-	install -m 0755 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer_hint.png $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
-	install -m 0755 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
-	install -d $(UPDATE_INST_DIR)/var/tuxbox/config
-	install -m 0644 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/
-	install -m 0644 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/
-	install -m 0644 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/
-	install -m 0644 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/
+	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/preinstall.sh $(PREINSTALL_SH)
+	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/update-ctrl/postinstall.sh $(POSTINSTALL_SH)
+	mkdir -p $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins
+	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.sh $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.cfg $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
+	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
+	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer_hint.png $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
+	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner $(UPDATE_INST_DIR)/share/tuxbox/neutrino/plugins/
+	mkdir -p $(UPDATE_INST_DIR)/var/tuxbox/config
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner.conf.template $(UPDATE_INST_DIR)/var/tuxbox/config/
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/auto-record-cleaner.rules.template $(UPDATE_INST_DIR)/var/tuxbox/config/
 	PKG_VERSION=`cat $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-sh/plugins/pr-auto-timer/pr-auto-timer | grep '^VERSION' | cut -d= -f2`; \
 	$(MAKE) u-update-bin \
 			UPDATE_MD5FILE=pr-auto-timer.txt \
@@ -112,8 +112,8 @@ matze-192 \
 matze-192-130 \
 pathauf-192:
 	$(MAKE) u-init
-	install -m 0755 $(IMAGEFILES)/channellists/update-ctrl/preinstall.sh $(PREINSTALL_SH)
-	install -m 0755 $(IMAGEFILES)/channellists/update-ctrl/postinstall.sh $(POSTINSTALL_SH)
+	$(INSTALL_EXEC) $(IMAGEFILES)/channellists/update-ctrl/preinstall.sh $(PREINSTALL_SH)
+	$(INSTALL_EXEC) $(IMAGEFILES)/channellists/update-ctrl/postinstall.sh $(POSTINSTALL_SH)
 	mkdir -pv $(UPDATE_INST_DIR)/var/tuxbox/config/zapit && \
 	cp -f $(IMAGEFILES)/channellists/$@/* $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/
 	# remove non-printable chars and re-format xml-files
diff --git a/make/linux-drivers.mk b/make/linux-drivers.mk
index 1d3e5fc8..43de740c 100644
--- a/make/linux-drivers.mk
+++ b/make/linux-drivers.mk
@@ -13,7 +13,7 @@ $(D)/rtl8192eu: $(D)/kernel-$(BOXTYPE) | $(TARGET_DIR)
 	$(CPDIR)/$(RTL8192EU_SOURCE)
 	$(CHDIR)/$(RTL8192EU_SOURCE); \
 		$(MAKE) $(KERNEL_MAKEVARS); \
-		install -m 0644 8192eu.ko $(TARGET_MODULES_DIR)/kernel/drivers/net/wireless/
+		$(INSTALL_DATA) 8192eu.ko $(TARGET_MODULES_DIR)/kernel/drivers/net/wireless/
 	make depmod
 	$(REMOVE)/$(RTL8192EU_SOURCE)
 	$(TOUCH)
diff --git a/make/linux-kernel.mk b/make/linux-kernel.mk
index b3595e3c..883e1d26 100644
--- a/make/linux-kernel.mk
+++ b/make/linux-kernel.mk
@@ -66,13 +66,13 @@ $(D)/kernel.do_prepare:
 		mv $(NI-LINUX-KERNEL) $(KERNEL_SRC)
 	$(MKDIR)/$(KERNEL_OBJ)
 	$(MKDIR)/$(KERNEL_MODULES)
-	install -m 644 $(KERNEL_CONFIG) $(BUILD_TMP)/$(KERNEL_OBJ)/.config
+	$(INSTALL_DATA) $(KERNEL_CONFIG) $(BUILD_TMP)/$(KERNEL_OBJ)/.config
 ifeq ($(BOXTYPE)-$(BOXSERIES), coolstream-hd1)
 	sed -i -e 's/EXTRAVERSION = .15/EXTRAVERSION = .13/g' $(BUILD_TMP)/$(KERNEL_SRC)/Makefile
 else ifeq ($(BOXTYPE)-$(BOXSERIES), coolstream-hd2)
 	sed -i -e 's/SUBLEVEL = 108/SUBLEVEL = 93/g' $(BUILD_TMP)/$(KERNEL_SRC)/Makefile
 else ifeq ($(BOXTYPE), armbox)
-	install -m 644 $(PATCHES)/initramfs-subdirboot.cpio.gz $(BUILD_TMP)/$(KERNEL_OBJ)
+	$(INSTALL_DATA) $(PATCHES)/initramfs-subdirboot.cpio.gz $(BUILD_TMP)/$(KERNEL_OBJ)
 endif
 	$(TOUCH)
 
diff --git a/make/neutrino-plugins.mk b/make/neutrino-plugins.mk
index 60878377..8c37d3cf 100644
--- a/make/neutrino-plugins.mk
+++ b/make/neutrino-plugins.mk
@@ -108,10 +108,10 @@ neutrino-plugin-%: $(NP_OBJ_DIR)/config.status
 
 $(D)/channellogos: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHAREICONS)
 	rm -rf $(SHAREICONS)/logo
-	install -d $(SHAREICONS)/logo
-	install -m 0644 $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logos/* $(SHAREICONS)/logo
-	install -d $(SHAREICONS)/logo/events
-	install -m 0644 $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logos-events/* $(SHAREICONS)/logo/events
+	mkdir -p $(SHAREICONS)/logo
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logos/* $(SHAREICONS)/logo
+	mkdir -p $(SHAREICONS)/logo/events
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logos-events/* $(SHAREICONS)/logo/events
 	$(CD) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-links; \
 		./logo-linker.sh logo-links.db $(SHAREICONS)/logo
 	$(TOUCH)
@@ -119,16 +119,16 @@ $(D)/channellogos: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHAREICONS)
 # -----------------------------------------------------------------------------
 
 $(D)/logo-addon: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHAREPLUGINS)
-	install -m 0755 $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.sh $(SHAREPLUGINS)/
-	install -m 0644 $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.cfg $(SHAREPLUGINS)/
-	install -m 0644 $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.png $(SHAREPLUGINS)/
+	$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.sh $(SHAREPLUGINS)/
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.cfg $(SHAREPLUGINS)/
+	$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.png $(SHAREPLUGINS)/
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
 
 $(D)/doscam-webif-skin:
-	install -D -m 0644 $(IMAGEFILES)/doscam-webif-skin/doscam_ni-dark.css $(TARGET_SHARE_DIR)/doscam/skin/doscam_ni-dark.css
-	install -D -m 0644 $(IMAGEFILES)/doscam-webif-skin/IC_doscam_ni.tpl $(TARGET_SHARE_DIR)/doscam/tpl/IC_doscam_ni.tpl
+	$(INSTALL_DATA) -D $(IMAGEFILES)/doscam-webif-skin/doscam_ni-dark.css $(TARGET_SHARE_DIR)/doscam/skin/doscam_ni-dark.css
+	$(INSTALL_DATA) -D $(IMAGEFILES)/doscam-webif-skin/IC_doscam_ni.tpl $(TARGET_SHARE_DIR)/doscam/tpl/IC_doscam_ni.tpl
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
diff --git a/make/neutrino.mk b/make/neutrino.mk
index 950d842c..36f1cb51 100644
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -236,7 +236,7 @@ endif
 	$(MAKE) $(N_OBJ_DIR)/config.status
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
 	$(MAKE) -C $(N_OBJ_DIR) all DESTDIR=$(TARGET_DIR)
-	install -D -m 0755 $(N_OBJ_DIR)/src/neutrino $(TARGET_DIR)/bin/neutrino
+	$(INSTALL_EXEC) -D $(N_OBJ_DIR)/src/neutrino $(TARGET_DIR)/bin/neutrino
 ifneq ($(DEBUG), yes)
 	$(TARGET_STRIP) $(TARGET_DIR)/bin/neutrino
 endif
diff --git a/make/target-lua.mk b/make/target-lua.mk
index 204b1d97..3ab95186 100644
--- a/make/target-lua.mk
+++ b/make/target-lua.mk
@@ -94,7 +94,7 @@ $(ARCHIVE)/$(LUAJSON_SOURCE):
 $(D)/luajson: $(ARCHIVE)/$(LUAJSON_SOURCE) | $(TARGET_DIR)
 	$(CD) $(ARCHIVE); \
 		curl --remote-name --time-cond $(LUAJSON_SOURCE) $(LUAJSON_URL) || true
-	install -D -m 0644 $(ARCHIVE)/$(LUAJSON_SOURCE) $(TARGET_SHARE_DIR)/lua/$(LUA_ABIVER)
+	$(INSTALL_DATA) -D $(ARCHIVE)/$(LUAJSON_SOURCE) $(TARGET_SHARE_DIR)/lua/$(LUA_ABIVER)
 	ln -sf $(LUAJSON_SOURCE) $(TARGET_SHARE_DIR)/lua/$(LUA_ABIVER)/json.lua
 	$(TOUCH)
 
diff --git a/make/target-rootfs.mk b/make/target-rootfs.mk
index b45aae89..5263e21c 100644
--- a/make/target-rootfs.mk
+++ b/make/target-rootfs.mk
@@ -65,7 +65,7 @@ ifeq ($(BOXSERIES), hd2)
 	$(CD) $(TARGET_DIR)/etc/network; \
 		ln -sf /var/etc/network/interfaces interfaces
 endif
-	install -d $(TARGET_DIR)/var/tuxbox/config
+	mkdir -p $(TARGET_DIR)/var/tuxbox/config
 	$(CD) $(TARGET_DIR)/var/tuxbox/config; \
 		ln -sf /var/keys/SoftCam.Key SoftCam.Key
 
diff --git a/make/target-scripts.mk b/make/target-scripts.mk
index ff65ab8f..35411eec 100644
--- a/make/target-scripts.mk
+++ b/make/target-scripts.mk
@@ -16,45 +16,45 @@ init-scripts: \
 	$(TARGET_DIR)/etc/init.d/syslogd
 
 $(TARGET_DIR)/etc/init.d/globals:
-	install -D -m 0644 $(IMAGEFILES)/scripts/init.globals $@
+	$(INSTALL_DATA) -D $(IMAGEFILES)/scripts/init.globals $@
 
 $(TARGET_DIR)/etc/init.d/functions:
-	install -D -m 0644 $(IMAGEFILES)/scripts/init.functions $@
+	$(INSTALL_DATA) -D $(IMAGEFILES)/scripts/init.functions $@
 
 $(TARGET_DIR)/etc/init.d/camd:
-	install -D -m 0755 $(IMAGEFILES)/scripts/camd.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/camd.init $@
 	ln -sf camd $(TARGET_DIR)/etc/init.d/S99camd
 	ln -sf camd $(TARGET_DIR)/etc/init.d/K01camd
 
 $(TARGET_DIR)/etc/init.d/camd_datefix:
-	install -D -m 0755 $(IMAGEFILES)/scripts/camd_datefix.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/camd_datefix.init $@
 
 $(TARGET_DIR)/etc/init.d/coredump:
 ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51 bre2ze4k))
-	install -D -m 0755 $(IMAGEFILES)/scripts/coredump.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/coredump.init $@
 endif
 
 $(TARGET_DIR)/etc/init.d/crond:
-	install -D -m 0755 $(IMAGEFILES)/scripts/crond.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/crond.init $@
 	ln -sf crond $(TARGET_DIR)/etc/init.d/S55crond
 	ln -sf crond $(TARGET_DIR)/etc/init.d/K55crond
 
 $(TARGET_DIR)/etc/init.d/hostname:
-	install -D -m 0755 $(IMAGEFILES)/scripts/hostname.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/hostname.init $@
 
 $(TARGET_DIR)/etc/init.d/inetd:
-	install -D -m 0755 $(IMAGEFILES)/scripts/inetd.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/inetd.init $@
 	ln -sf inetd $(TARGET_DIR)/etc/init.d/S53inetd
 	ln -sf inetd $(TARGET_DIR)/etc/init.d/K80inetd
 
 $(TARGET_DIR)/etc/init.d/swap:
 ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd51 bre2ze4k))
-	install -D -m 0755 $(IMAGEFILES)/scripts/swap.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/swap.init $@
 	ln -sf swap $(TARGET_DIR)/etc/init.d/K99swap
 endif
 
 $(TARGET_DIR)/etc/init.d/syslogd:
-	install -D -m 0755 $(IMAGEFILES)/scripts/syslogd.init $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/syslogd.init $@
 	ln -sf syslogd $(TARGET_DIR)/etc/init.d/K98syslogd
 
 # -----------------------------------------------------------------------------
@@ -65,12 +65,12 @@ scripts: \
 	$(TARGET_SHARE_DIR)/udhcpc/default.script
 
 $(TARGET_DIR)/sbin/service:
-	install -D -m 0755 $(IMAGEFILES)/scripts/service $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/service $@
 
 $(TARGET_DIR)/sbin/flash_eraseall:
 ifeq ($(BOXTYPE), coolstream)
-	install -D -m 0755 $(IMAGEFILES)/scripts/flash_eraseall $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/flash_eraseall $@
 endif
 
 $(TARGET_SHARE_DIR)/udhcpc/default.script:
-	install -D -m 0755 $(IMAGEFILES)/scripts/udhcpc-default.script $@
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/udhcpc-default.script $@
diff --git a/make/target-tools-unused.mk b/make/target-tools-unused.mk
index d387b056..e5546a54 100644
--- a/make/target-tools-unused.mk
+++ b/make/target-tools-unused.mk
@@ -61,8 +61,8 @@ $(D)/binutils: $(ARCHIVE)/$(BINUTILS_SOURCE) | $(TARGET_DIR)
 			--disable-gdb \
 			; \
 		$(MAKE); \
-		install -m 0755 binutils/objdump $(TARGET_BIN_DIR)/
-		install -m 0755 binutils/objcopy $(TARGET_BIN_DIR)/
+		$(INSTALL_EXEC) binutils/objdump $(TARGET_BIN_DIR)/
+		$(INSTALL_EXEC) binutils/objcopy $(TARGET_BIN_DIR)/
 	$(REMOVE)/$(BINUTILS_TMP)
 	$(TOUCH)
 
@@ -159,7 +159,7 @@ $(D)/iozone3: $(ARCHIVE)/$(IOZONE_SOURCE) | $(TARGET_DIR)
 		sed -i -e "s/= cc/= $(TARGET_CC)/" makefile; \
 		$(BUILD_ENV) \
 		$(MAKE) linux-arm; \
-		install -m 0755 iozone $(TARGET_BIN_DIR)/
+		$(INSTALL_EXEC) iozone $(TARGET_BIN_DIR)/
 	$(REMOVE)/$(IOZONE_TMP)
 	$(TOUCH)
 
diff --git a/make/target-tools.mk b/make/target-tools.mk
index 0b806487..329b4477 100644
--- a/make/target-tools.mk
+++ b/make/target-tools.mk
@@ -157,14 +157,14 @@ $(D)/tzdata: $(HOST_ZIC) $(ARCHIVE)/$(TZDATA_SOURCE) | $(TARGET_DIR)
 		while read x; do \
 			find zoneinfo.tmp -type f -name $$x | sort | \
 			while read y; do \
-				install -m 0644 $$y zoneinfo/$$x; \
+				$(INSTALL_DATA) $$y zoneinfo/$$x; \
 			done; \
 			test -e zoneinfo/$$x || echo "WARNING: timezone $$x not found."; \
 		done; \
-		install -d $(TARGET_SHARE_DIR); \
+		mkdir -p $(TARGET_SHARE_DIR); \
 		mv zoneinfo/ $(TARGET_SHARE_DIR)/
-	install -m 0644 -D $(IMAGEFILES)/tzdata/timezone.xml $(TARGET_DIR)/etc/timezone.xml
-	install -m 0644 $(TARGET_SHARE_DIR)/zoneinfo/CET $(TARGET_DIR)/$(LOCALTIME)
+	$(INSTALL_DATA) -D $(IMAGEFILES)/tzdata/timezone.xml $(TARGET_DIR)/etc/timezone.xml
+	$(INSTALL_DATA) $(TARGET_SHARE_DIR)/zoneinfo/CET $(TARGET_DIR)/$(LOCALTIME)
 	$(REMOVE)/$(TZDATA_TMP)
 	$(TOUCH)
 
@@ -192,13 +192,13 @@ $(D)/mtd-utils: $(D)/zlib $(D)/lzo $(D)/e2fsprogs $(ARCHIVE)/$(MTD-UTILS_SOURCE)
 			; \
 		$(MAKE)
 ifeq ($(BOXSERIES), hd2)
-	install -D -m 0755 $(BUILD_TMP)/$(MTD-UTILS_TMP)/nanddump $(TARGET_DIR)/sbin
-	install -D -m 0755 $(BUILD_TMP)/$(MTD-UTILS_TMP)/nandtest $(TARGET_DIR)/sbin
-	install -D -m 0755 $(BUILD_TMP)/$(MTD-UTILS_TMP)/nandwrite $(TARGET_DIR)/sbin
-	install -D -m 0755 $(BUILD_TMP)/$(MTD-UTILS_TMP)/mtd_debug $(TARGET_DIR)/sbin
-	install -D -m 0755 $(BUILD_TMP)/$(MTD-UTILS_TMP)/mkfs.jffs2 $(TARGET_DIR)/sbin
+	$(INSTALL_EXEC) -D $(BUILD_TMP)/$(MTD-UTILS_TMP)/nanddump $(TARGET_DIR)/sbin
+	$(INSTALL_EXEC) -D $(BUILD_TMP)/$(MTD-UTILS_TMP)/nandtest $(TARGET_DIR)/sbin
+	$(INSTALL_EXEC) -D $(BUILD_TMP)/$(MTD-UTILS_TMP)/nandwrite $(TARGET_DIR)/sbin
+	$(INSTALL_EXEC) -D $(BUILD_TMP)/$(MTD-UTILS_TMP)/mtd_debug $(TARGET_DIR)/sbin
+	$(INSTALL_EXEC) -D $(BUILD_TMP)/$(MTD-UTILS_TMP)/mkfs.jffs2 $(TARGET_DIR)/sbin
 endif
-	install -D -m 0755 $(BUILD_TMP)/$(MTD-UTILS_TMP)/flash_erase $(TARGET_DIR)/sbin
+	$(INSTALL_EXEC) -D $(BUILD_TMP)/$(MTD-UTILS_TMP)/flash_erase $(TARGET_DIR)/sbin
 	$(REMOVE)/$(MTD-UTILS_TMP)
 	$(TOUCH)
 
@@ -285,7 +285,7 @@ $(D)/hdparm: $(ARCHIVE)/$(HDPARM_SOURCE) | $(TARGET_DIR)
 	$(CHDIR)/$(HDPARM_TMP); \
 		$(BUILD_ENV) \
 		$(MAKE); \
-		install -D -m 0755 hdparm $(TARGET_DIR)/sbin/hdparm
+		$(INSTALL_EXEC) -D hdparm $(TARGET_DIR)/sbin/hdparm
 	$(REMOVE)/$(HDPARM_TMP)
 	$(TOUCH)
 
@@ -305,7 +305,7 @@ $(D)/hd-idle: $(ARCHIVE)/$(HD-IDLE_SOURCE) | $(TARGET_DIR)
 	$(CHDIR)/$(HD-IDLE_TMP); \
 		$(BUILD_ENV) \
 		$(MAKE); \
-		install -D -m 0755 hd-idle $(TARGET_DIR)/sbin/hd-idle
+		$(INSTALL_EXEC) -D hd-idle $(TARGET_DIR)/sbin/hd-idle
 	$(REMOVE)/$(HD-IDLE_TMP)
 	$(TOUCH)
 
@@ -346,7 +346,7 @@ $(D)/coreutils: $(ARCHIVE)/$(COREUTILS_SOURCE) | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	for bin in $(COREUTILS_BIN); do \
 		rm -f $(TARGET_DIR)/bin/$$bin; \
-		install -m 0755 $(TARGET_DIR)/bin.coreutils/$$bin $(TARGET_DIR)/bin/$$bin; \
+		$(INSTALL_EXEC) $(TARGET_DIR)/bin.coreutils/$$bin $(TARGET_DIR)/bin/$$bin; \
 	done
 	$(REMOVE)/$(COREUTILS_TMP) \
 		$(TARGET_DIR)/bin.coreutils
@@ -403,8 +403,8 @@ $(D)/ntp: $(D)/openssl $(ARCHIVE)/$(NTP_SOURCE) | $(TARGET_DIR)
 			--without-ntpsnmpd \
 			; \
 		$(MAKE); \
-		install -D -m 0755 ntpdate/ntpdate $(TARGET_DIR)/sbin/ntpdate
-	install -D -m 0755 $(IMAGEFILES)/scripts/ntpdate.init $(TARGET_DIR)/etc/init.d/ntpdate
+		$(INSTALL_EXEC) -D ntpdate/ntpdate $(TARGET_DIR)/sbin/ntpdate
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/ntpdate.init $(TARGET_DIR)/etc/init.d/ntpdate
 	$(REMOVE)/$(NTP_TMP)
 	$(TOUCH)
 
@@ -439,7 +439,7 @@ $(D)/djmount: $(D)/libfuse $(ARCHIVE)/$(DJMOUNT_SOURCE) | $(TARGET_DIR)
 			; \
 		make; \
 		make install DESTDIR=$(TARGET_DIR)
-	install -D -m 0755 $(IMAGEFILES)/scripts/djmount.init $(TARGET_DIR)/etc/init.d/djmount
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/djmount.init $(TARGET_DIR)/etc/init.d/djmount
 	ln -sf djmount $(TARGET_DIR)/etc/init.d/S99djmount
 	ln -sf djmount $(TARGET_DIR)/etc/init.d/K01djmount
 	$(REMOVE)/$(DJMOUNT_TMP)
@@ -476,9 +476,9 @@ $(D)/ushare: $(D)/libupnp $(ARCHIVE)/$(USHARE_SOURCE)| $(TARGET_DIR)
 		ln -sf ../config.h src/; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	install -D -m 0644 $(IMAGEFILES)/scripts/ushare.conf $(TARGET_DIR)/etc/ushare.conf
+	$(INSTALL_DATA) -D $(IMAGEFILES)/scripts/ushare.conf $(TARGET_DIR)/etc/ushare.conf
 	sed -i 's|%(BOXTYPE)|$(BOXTYPE)|; s|%(BOXMODEL)|$(BOXMODEL)|' $(TARGET_DIR)/etc/ushare.conf
-	install -D -m 0755 $(IMAGEFILES)/scripts/ushare.init $(TARGET_DIR)/etc/init.d/ushare
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/ushare.init $(TARGET_DIR)/etc/init.d/ushare
 	ln -sf ushare $(TARGET_DIR)/etc/init.d/S99ushare
 	ln -sf ushare $(TARGET_DIR)/etc/init.d/K01ushare
 	$(REMOVE)/$(USHARE_TMP)
@@ -503,7 +503,7 @@ $(D)/smartmontools: $(ARCHIVE)/$(SMARTMONTOOLS_SOURCE) | $(TARGET_DIR)
 			--prefix= \
 			; \
 		$(MAKE); \
-		install -D -m 0755 smartctl $(TARGET_DIR)/sbin/smartctl
+		$(INSTALL_EXEC) -D smartctl $(TARGET_DIR)/sbin/smartctl
 	$(REMOVE)/$(SMARTMONTOOLS_TMP)
 	$(TOUCH)
 
@@ -532,9 +532,9 @@ $(D)/inadyn: $(D)/openssl $(D)/confuse $(D)/libite $(ARCHIVE)/$(INADYN_SOURCE) |
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	install -D -m 0644 $(IMAGEFILES)/scripts/inadyn.conf $(TARGET_DIR)/var/etc/inadyn.conf
+	$(INSTALL_DATA) -D $(IMAGEFILES)/scripts/inadyn.conf $(TARGET_DIR)/var/etc/inadyn.conf
 	ln -sf /var/etc/inadyn.conf $(TARGET_DIR)/etc/inadyn.conf
-	install -D -m 0755 $(IMAGEFILES)/scripts/inadyn.init $(TARGET_DIR)/etc/init.d/inadyn
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/inadyn.init $(TARGET_DIR)/etc/init.d/inadyn
 	ln -sf inadyn $(TARGET_DIR)/etc/init.d/S80inadyn
 	ln -sf inadyn $(TARGET_DIR)/etc/init.d/K60inadyn
 	$(REMOVE)/$(INADYN_TMP)
@@ -564,11 +564,11 @@ $(D)/vsftpd: $(D)/openssl $(ARCHIVE)/$(VSFTPD_SOURCE) | $(TARGET_DIR)
 		sed -i -e 's/.*VSF_BUILD_SSL/#define VSF_BUILD_SSL/' builddefs.h; \
 		$(MAKE) clean; \
 		$(MAKE) $(BUILD_ENV) LIBS="-lcrypt -lcrypto -lssl"; \
-		install -D -m 0755 vsftpd $(TARGET_DIR)/sbin/vsftpd
-	install -d $(TARGET_SHARE_DIR)/empty
-	install -D -m 0644 $(IMAGEFILES)/scripts/vsftpd.conf $(TARGET_DIR)/etc/vsftpd.conf
-	install -D -m 0644 $(IMAGEFILES)/scripts/vsftpd.chroot_list $(TARGET_DIR)/etc/vsftpd.chroot_list
-	install -D -m 0755 $(IMAGEFILES)/scripts/vsftpd.init $(TARGET_DIR)/etc/init.d/vsftpd
+		$(INSTALL_EXEC) -D vsftpd $(TARGET_DIR)/sbin/vsftpd
+	mkdir -p $(TARGET_SHARE_DIR)/empty
+	$(INSTALL_DATA) -D $(IMAGEFILES)/scripts/vsftpd.conf $(TARGET_DIR)/etc/vsftpd.conf
+	$(INSTALL_DATA) -D $(IMAGEFILES)/scripts/vsftpd.chroot_list $(TARGET_DIR)/etc/vsftpd.chroot_list
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/vsftpd.init $(TARGET_DIR)/etc/init.d/vsftpd
 	ln -sf vsftpd $(TARGET_DIR)/etc/init.d/S53vsftpd
 	ln -sf vsftpd $(TARGET_DIR)/etc/init.d/K80vsftpd
 	$(REMOVE)/$(VSFTPD_TMP)
@@ -608,7 +608,7 @@ $(D)/procps-ng: $(D)/ncurses $(ARCHIVE)/$(PROCPS-NG_SOURCE) | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	for bin in $(PROCPS-NG_BIN); do \
 		rm -f $(TARGET_DIR)/bin/$$bin; \
-		install -m 0755 $(TARGET_DIR)/bin.procps/$$bin $(TARGET_DIR)/bin/$$bin; \
+		$(INSTALL_EXEC) $(TARGET_DIR)/bin.procps/$$bin $(TARGET_DIR)/bin/$$bin; \
 	done
 	$(REWRITE_PKGCONF)/libprocps.pc
 	$(REWRITE_LIBTOOL)/libprocps.la
@@ -667,7 +667,7 @@ $(D)/minicom: $(D)/ncurses $(ARCHIVE)/$(MINICOM_SOURCE) | $(TARGET_DIR)
 			--disable-nls \
 			; \
 		$(MAKE); \
-		install -m 0755 src/minicom $(TARGET_DIR)/bin
+		$(INSTALL_EXEC) src/minicom $(TARGET_DIR)/bin
 	$(REMOVE)/$(MINICOM_TMP)
 	$(TOUCH)
 
@@ -907,8 +907,8 @@ $(D)/samba33: $(D)/zlib $(ARCHIVE)/$(SAMBA33_SOURCE) | $(TARGET_DIR)
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	mkdir -p $(TARGET_DIR)/var/samba/locks
-	install -m 0644 $(IMAGEFILES)/scripts/smb3.conf $(TARGET_DIR)/etc/samba/smb.conf
-	install -m 0755 $(IMAGEFILES)/scripts/samba3.init $(TARGET_DIR)/etc/init.d/samba
+	$(INSTALL_DATA) $(IMAGEFILES)/scripts/smb3.conf $(TARGET_DIR)/etc/samba/smb.conf
+	$(INSTALL_EXEC) $(IMAGEFILES)/scripts/samba3.init $(TARGET_DIR)/etc/init.d/samba
 	ln -sf samba $(TARGET_DIR)/etc/init.d/S99samba
 	ln -sf samba $(TARGET_DIR)/etc/init.d/K01samba
 	rm -rf $(TARGET_DIR)/bin/testparm
@@ -988,7 +988,7 @@ $(D)/samba36: $(D)/zlib $(ARCHIVE)/$(SAMBA36_SOURCE) | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	mkdir -p $(TARGET_DIR)/var/samba/locks
 	install $(IMAGEFILES)/scripts/smb3.conf $(TARGET_DIR)/etc/samba/smb.conf
-	install -m 0755 $(IMAGEFILES)/scripts/samba3.init $(TARGET_DIR)/etc/init.d/samba
+	$(INSTALL_EXEC) $(IMAGEFILES)/scripts/samba3.init $(TARGET_DIR)/etc/init.d/samba
 	ln -sf samba $(TARGET_DIR)/etc/init.d/S99samba
 	ln -sf samba $(TARGET_DIR)/etc/init.d/K01samba
 	rm -rf $(TARGET_DIR)/bin/testparm
@@ -1037,8 +1037,8 @@ $(D)/dropbear: $(D)/zlib $(ARCHIVE)/$(DROPBEAR_SOURCE) | $(TARGET_DIR)
 		sed -i 's|/usr/|/|g' default_options.h; \
 		$(MAKE) PROGRAMS="dropbear dbclient dropbearkey scp" SCPPROGRESS=1; \
 		$(MAKE) PROGRAMS="dropbear dbclient dropbearkey scp" install DESTDIR=$(TARGET_DIR)
-	install -d -m 0755 $(TARGET_DIR)/etc/dropbear
-	install -D -m 0755 $(IMAGEFILES)/scripts/dropbear.init $(TARGET_DIR)/etc/init.d/dropbear
+	mkdir -p $(TARGET_DIR)/etc/dropbear
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/dropbear.init $(TARGET_DIR)/etc/init.d/dropbear
 	ln -sf dropbear $(TARGET_DIR)/etc/init.d/S60dropbear
 	ln -sf dropbear $(TARGET_DIR)/etc/init.d/K60dropbear
 	$(REMOVE)/$(DROPBEAR_TMP)
@@ -1069,10 +1069,10 @@ $(D)/sg3_utils: $(ARCHIVE)/$(SG3_UTILS_SOURCE) | $(TARGET_DIR)
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	for bin in $(SG3_UTILS_BIN); do \
 		rm -f $(TARGET_DIR)/bin/$$bin; \
-		install -m 0755 $(TARGET_DIR)/bin.sg3_utils/$$bin $(TARGET_DIR)/bin/$$bin; \
+		$(INSTALL_EXEC) $(TARGET_DIR)/bin.sg3_utils/$$bin $(TARGET_DIR)/bin/$$bin; \
 	done
 	$(REWRITE_LIBTOOL)/libsgutils2.la
-	install -D -m 0755 $(IMAGEFILES)/scripts/sdX.init $(TARGET_DIR)/etc/init.d/sdX
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/sdX.init $(TARGET_DIR)/etc/init.d/sdX
 	ln -sf sdX $(TARGET_DIR)/etc/init.d/K97sdX
 	$(REMOVE)/$(SG3_UTILS_TMP) \
 		$(TARGET_DIR)/bin.sg3_utils
@@ -1099,7 +1099,7 @@ $(D)/fbshot: $(D)/libpng $(ARCHIVE)/$(FBSHOT_SOURCE) | $(TARGET_DIR)
 		sed -i 's|	gcc |	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) |' Makefile; \
 		sed -i '/strip fbshot/d' Makefile; \
 		$(MAKE) all; \
-		install -D -m 0755 fbshot $(TARGET_DIR)/bin/fbshot
+		$(INSTALL_EXEC) -D fbshot $(TARGET_DIR)/bin/fbshot
 	$(REMOVE)/$(FBSHOT_TMP)
 	$(TOUCH)
 
@@ -1148,7 +1148,7 @@ $(D)/samsunglcd4linux: | $(TARGET_DIR)
 	get-git-source.sh $(SAMSUNGLCD4LINUX_URL)/$(SAMSUNGLCD4LINUX_SOURCE) $(ARCHIVE)/$(SAMSUNGLCD4LINUX_SOURCE)
 	$(CPDIR)/$(SAMSUNGLCD4LINUX_SOURCE)
 	$(CHDIR)/$(SAMSUNGLCD4LINUX_TMP)/ni; \
-		install -m 0600 etc/lcd4linux.conf $(TARGET_DIR)/etc; \
+		$(INSTALL) -m 0600 etc/lcd4linux.conf $(TARGET_DIR)/etc; \
 		cp -a share/* $(TARGET_SHARE_DIR)
 	$(REMOVE)/$(SAMSUNGLCD4LINUX_TMP)
 	$(TOUCH)
@@ -1171,8 +1171,8 @@ $(D)/wpa_supplicant: $(D)/openssl $(ARCHIVE)/$(WPA_SUPPLICANT_SOURCE) | $(TARGET
 		$(BUILD_ENV) \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR) BINDIR=/sbin
-	install -D -m 0755 $(IMAGEFILES)/scripts/pre-wlan0.sh $(TARGET_DIR)/etc/network/pre-wlan0.sh
-	install -D -m 0755 $(IMAGEFILES)/scripts/post-wlan0.sh $(TARGET_DIR)/etc/network/post-wlan0.sh
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/pre-wlan0.sh $(TARGET_DIR)/etc/network/pre-wlan0.sh
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/post-wlan0.sh $(TARGET_DIR)/etc/network/post-wlan0.sh
 	$(REMOVE)/$(WPA_SUPPLICANT_TMP)
 	$(TOUCH)
 
@@ -1198,15 +1198,15 @@ $(D)/xupnpd: $(D)/lua $(D)/openssl | $(TARGET_DIR)
 	$(CHDIR)/$(XUPNPD_TMP)/src; \
 		$(BUILD_ENV) \
 		$(MAKE) embedded TARGET=$(TARGET) CC=$(TARGET_CC) STRIP=$(TARGET_STRIP) LUAFLAGS="$(TARGET_LDFLAGS) -I$(TARGET_INCLUDE_DIR)"; \
-		install -D -m 0755 xupnpd $(TARGET_BIN_DIR)/; \
-		install -d $(TARGET_SHARE_DIR)/xupnpd/config; \
+		$(INSTALL_EXEC) -D xupnpd $(TARGET_BIN_DIR)/; \
+		mkdir -p $(TARGET_SHARE_DIR)/xupnpd/config; \
 		cp -a plugins profiles ui www *.lua $(TARGET_SHARE_DIR)/xupnpd/
 	rm $(TARGET_SHARE_DIR)/xupnpd/plugins/staff/xupnpd_18plus.lua
-	install -D -m 0644 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_18plus.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/
-	install -D -m 0644 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_youtube.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/
-	install -D -m 0644 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_coolstream.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/
-	install -D -m 0644 $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_cczwei.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/
-	install -D -m 0755 $(IMAGEFILES)/scripts/xupnpd.init $(TARGET_DIR)/etc/init.d/xupnpd
+	$(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_18plus.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/
+	$(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_youtube.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/
+	$(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_coolstream.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/
+	$(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_cczwei.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/xupnpd.init $(TARGET_DIR)/etc/init.d/xupnpd
 	ln -sf xupnpd $(TARGET_DIR)/etc/init.d/S99xupnpd
 	ln -sf xupnpd $(TARGET_DIR)/etc/init.d/K01xupnpd
 	cp -a $(IMAGEFILES)/xupnpd/* $(TARGET_DIR)/
@@ -1289,7 +1289,7 @@ $(D)/nfs-utils: $(D)/rpcbind $(ARCHIVE)/$(NFS-UTILS_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	chmod 755 $(TARGET_DIR)/sbin/mount.nfs
+	chmod 0755 $(TARGET_DIR)/sbin/mount.nfs
 	rm -rf $(TARGET_DIR)/sbin/mountstats
 	rm -rf $(TARGET_DIR)/sbin/nfsiostat
 	rm -rf $(TARGET_DIR)/sbin/osd_login
@@ -1298,7 +1298,7 @@ $(D)/nfs-utils: $(D)/rpcbind $(ARCHIVE)/$(NFS-UTILS_SOURCE) | $(TARGET_DIR)
 	rm -rf $(TARGET_DIR)/sbin/umount.nfs*
 	rm -rf $(TARGET_DIR)/sbin/showmount
 	rm -rf $(TARGET_DIR)/sbin/rpcdebug
-	install -D -m 0755 $(IMAGEFILES)/scripts/nfsd.init $(TARGET_DIR)/etc/init.d/nfsd
+	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/nfsd.init $(TARGET_DIR)/etc/init.d/nfsd
 	ln -s nfsd $(TARGET_DIR)/etc/init.d/S60nfsd
 	ln -s nfsd $(TARGET_DIR)/etc/init.d/K01nfsd
 	$(REMOVE)/$(NFS-UTILS_TMP)
@@ -1406,7 +1406,7 @@ $(D)/streamripper: $(D)/libvorbisidec $(D)/libmad $(D)/glib2 | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	install -m 0755 $(IMAGEFILES)/scripts/streamripper.sh $(TARGET_DIR)/bin/
+	$(INSTALL_EXEC) $(IMAGEFILES)/scripts/streamripper.sh $(TARGET_DIR)/bin/
 	$(REMOVE)/$(NI-STREAMRIPPER)
 	$(TOUCH)
 
@@ -1558,9 +1558,9 @@ $(D)/ofgwrite: $(SOURCE_DIR)/$(NI-OFGWRITE) | $(TARGET_DIR)
 	$(CHDIR)/$(NI-OFGWRITE); \
 		$(BUILD_ENV) \
 		$(MAKE)
-	install -m 0755 $(BUILD_TMP)/$(NI-OFGWRITE)/ofgwrite_bin $(TARGET_DIR)/bin
-	install -m 0755 $(BUILD_TMP)/$(NI-OFGWRITE)/ofgwrite_caller $(TARGET_DIR)/bin
-	install -m 0755 $(BUILD_TMP)/$(NI-OFGWRITE)/ofgwrite $(TARGET_DIR)/bin
+	$(INSTALL_EXEC) $(BUILD_TMP)/$(NI-OFGWRITE)/ofgwrite_bin $(TARGET_DIR)/bin
+	$(INSTALL_EXEC) $(BUILD_TMP)/$(NI-OFGWRITE)/ofgwrite_caller $(TARGET_DIR)/bin
+	$(INSTALL_EXEC) $(BUILD_TMP)/$(NI-OFGWRITE)/ofgwrite $(TARGET_DIR)/bin
 	$(REMOVE)/$(NI-OFGWRITE)
 	$(TOUCH)
 
@@ -1658,7 +1658,7 @@ $(D)/gptfdisk: $(D)/popt $(D)/e2fsprogs $(ARCHIVE)/$(GPTFDISK_SOURCE) | $(TARGET
 		sed -i 's|^CXX=.*|CXX=$(TARGET_CXX)|' Makefile; \
 		$(BUILD_ENV) \
 		$(MAKE) sgdisk; \
-		install -D -m 0755 sgdisk $(TARGET_DIR)/sbin/sgdisk
+		$(INSTALL_EXEC) -D sgdisk $(TARGET_DIR)/sbin/sgdisk
 	$(REMOVE)/$(GPTFDISK_TMP)
 	$(TOUCH)
 
@@ -1673,5 +1673,5 @@ $(ARCHIVE)/$(CA-BUNDLE_SOURCE):
 $(D)/ca-bundle: $(ARCHIVE)/$(CA-BUNDLE_SOURCE) | $(TARGET_DIR)
 	$(CD) $(ARCHIVE); \
 		curl --remote-name --time-cond $(CA-BUNDLE_SOURCE) $(CA-BUNDLE_URL)/$(CA-BUNDLE_SOURCE) || true
-	install -D -m 0644 $(ARCHIVE)/$(CA-BUNDLE_SOURCE) $(TARGET_DIR)/$(CA-BUNDLE_DIR)/$(CA-BUNDLE)
+	$(INSTALL_DATA) -D $(ARCHIVE)/$(CA-BUNDLE_SOURCE) $(TARGET_DIR)/$(CA-BUNDLE_DIR)/$(CA-BUNDLE)
 	$(TOUCH)