diff --git a/config/functions b/config/functions
index e7d7002a85..62fd7b7698 100644
--- a/config/functions
+++ b/config/functions
@@ -1027,6 +1027,12 @@ source_package() {
     fi
 
     PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
+
+    if [[ "${1}" =~ :target$ || "${1//:/}" = "${1}" ]]; then
+      PKG_INSTALL="${PKG_BUILD}/.install_pkg"
+    elif [[ "${1}" =~ :init$ ]]; then
+      PKG_INSTALL="${PKG_BUILD}/.install_init"
+    fi
   fi
 
   build_with_debug && BUILD_WITH_DEBUG="yes" || BUILD_WITH_DEBUG="no"
@@ -1171,17 +1177,17 @@ install_binary_addon() {
   local addon_id="$1" addon_so
 
   mkdir -p $ADDON_BUILD/$addon_id/
-  cp -R $PKG_BUILD/.install_pkg/usr/share/$MEDIACENTER/addons/$addon_id/* $ADDON_BUILD/$addon_id/
+  cp -R $PKG_INSTALL/usr/share/$MEDIACENTER/addons/$addon_id/* $ADDON_BUILD/$addon_id/
 
   addon_so=$(xmlstarlet sel -t -v "/addon/extension/@library_linux" $ADDON_BUILD/$addon_id/addon.xml || :)
   if [ -n "$addon_so" ]; then
-    cp -L $PKG_BUILD/.install_pkg/usr/lib/$MEDIACENTER/addons/$addon_id/$addon_so $ADDON_BUILD/$addon_id/
+    cp -L $PKG_INSTALL/usr/lib/$MEDIACENTER/addons/$addon_id/$addon_so $ADDON_BUILD/$addon_id/
     chmod +x $ADDON_BUILD/$addon_id/$addon_so
   fi
 
-  if [ -d $PKG_BUILD/.install_pkg/usr/lib/kernel-overlays/$addon_id ] ; then
+  if [ -d $PKG_INSTALL/usr/lib/kernel-overlays/$addon_id ] ; then
     mkdir -p $ADDON_BUILD/$addon_id/kernel-overlay
-    cp -PR $PKG_BUILD/.install_pkg/usr/lib/kernel-overlays/$addon_id/* $ADDON_BUILD/$addon_id/kernel-overlay
+    cp -PR $PKG_INSTALL/usr/lib/kernel-overlays/$addon_id/* $ADDON_BUILD/$addon_id/kernel-overlay
   fi
 }
 
diff --git a/packages/addons/service/lcdd/package.mk b/packages/addons/service/lcdd/package.mk
index 456bec317d..2cc6ed2e11 100644
--- a/packages/addons/service/lcdd/package.mk
+++ b/packages/addons/service/lcdd/package.mk
@@ -40,9 +40,9 @@ addon() {
 
   cp -PR $PKG_DIR/resources $ADDON_BUILD/$PKG_ADDON_ID
 
-  cp -PR $PKG_BUILD/.install_pkg/etc/LCDd.conf $ADDON_BUILD/$PKG_ADDON_ID/config/
-  cp -PR $PKG_BUILD/.install_pkg/usr/lib       $ADDON_BUILD/$PKG_ADDON_ID/lib/
-  cp -PR $PKG_BUILD/.install_pkg/usr/sbin      $ADDON_BUILD/$PKG_ADDON_ID/bin/
+  cp -PR $PKG_INSTALL/etc/LCDd.conf $ADDON_BUILD/$PKG_ADDON_ID/config/
+  cp -PR $PKG_INSTALL/usr/lib       $ADDON_BUILD/$PKG_ADDON_ID/lib/
+  cp -PR $PKG_INSTALL/usr/sbin      $ADDON_BUILD/$PKG_ADDON_ID/bin/
 
   cp -L $(get_build_dir serdisplib)/.install_pkg/usr/lib/libserdisp.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib/
 
diff --git a/packages/addons/service/minidlna/package.mk b/packages/addons/service/minidlna/package.mk
index 7f7a30258e..d1f0cd847d 100644
--- a/packages/addons/service/minidlna/package.mk
+++ b/packages/addons/service/minidlna/package.mk
@@ -35,7 +35,7 @@ pre_configure_target() {
 
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/.install_pkg/usr/sbin/minidlnad $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $PKG_INSTALL/usr/sbin/minidlnad $ADDON_BUILD/$PKG_ADDON_ID/bin
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -p $(get_build_dir libexif)/.install_pkg/usr/lib/libexif.so.12 $ADDON_BUILD/$PKG_ADDON_ID/lib
diff --git a/packages/addons/service/tinc/package.mk b/packages/addons/service/tinc/package.mk
index 795d1a16bd..d3fafb024e 100644
--- a/packages/addons/service/tinc/package.mk
+++ b/packages/addons/service/tinc/package.mk
@@ -32,6 +32,6 @@ make_target() {
 
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp $PKG_BUILD/.install_pkg/usr/sbin/* \
+  cp $PKG_INSTALL/usr/sbin/* \
      $ADDON_BUILD/$PKG_ADDON_ID/bin
 }
diff --git a/packages/addons/service/ttyd/package.mk b/packages/addons/service/ttyd/package.mk
index 588adefb71..2ba739fa64 100644
--- a/packages/addons/service/ttyd/package.mk
+++ b/packages/addons/service/ttyd/package.mk
@@ -20,7 +20,7 @@ PKG_ADDON_TYPE="xbmc.service"
 
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/.install_pkg/usr/bin/ttyd $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $PKG_INSTALL/usr/bin/ttyd $ADDON_BUILD/$PKG_ADDON_ID/bin
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -p $(get_build_dir json-c)/.install_pkg/usr/lib/libjson-c.so $ADDON_BUILD/$PKG_ADDON_ID/lib
diff --git a/packages/security/nss/package.mk b/packages/security/nss/package.mk
index e81fc48214..60cf565857 100644
--- a/packages/security/nss/package.mk
+++ b/packages/security/nss/package.mk
@@ -75,6 +75,6 @@ makeinstall_target() {
   cp -RL dist/{public,private}/nss/* $SYSROOT_PREFIX/usr/include/nss
   cp -L dist/Linux*/lib/pkgconfig/nss.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
 
-  mkdir -p .install_pkg/usr/lib
-    cp -PL dist/Linux*/lib/*.so .install_pkg/usr/lib
+  mkdir -p $PKG_INSTALL/usr/lib
+    cp -PL dist/Linux*/lib/*.so $PKG_INSTALL/usr/lib
 }
diff --git a/scripts/build b/scripts/build
index cd75277be5..08b1bb7811 100755
--- a/scripts/build
+++ b/scripts/build
@@ -115,13 +115,8 @@ build_msg "CLR_TOOLCHAIN" "TOOLCHAIN" "${PKG_TOOLCHAIN}${_auto_toolchain}"
 setup_toolchain ${TARGET} ${PKG_TOOLCHAIN}
 
 # configure install directory
-if [ "${TARGET}" = "target" ]; then
-  INSTALL="${PKG_BUILD}/.install_pkg"
-elif [ "${TARGET}" = "init" ]; then
-  INSTALL="${PKG_BUILD}/.install_init"
-else
-  unset INSTALL
-fi
+[ -n "${PKG_INSTALL}" ] && INSTALL="${PKG_INSTALL}" || unset INSTALL
+
 # remove previous install files
 if [ -n "${INSTALL}" -a -d "${INSTALL}" ]; then
   rm -rf "${INSTALL}"
diff --git a/scripts/install b/scripts/install
index d0a22ac58e..2c0aec42e7 100755
--- a/scripts/install
+++ b/scripts/install
@@ -137,10 +137,8 @@ if [ "${TARGET}" = "target" ] ; then
   pkg_call_exists pre_install && pkg_call pre_install
 fi
 
-if [ "${TARGET}" = "target" -a -d ${PKG_BUILD}/.install_pkg ]; then
-  cp -PR ${PKG_BUILD}/.install_pkg/* ${INSTALL}
-elif [ "${TARGET}" = "init" -a -d ${PKG_BUILD}/.install_init ]; then
-  cp -PR ${PKG_BUILD}/.install_init/* ${INSTALL}
+if [ -n "${PKG_INSTALL}" -a -d "${PKG_INSTALL}" ]; then
+  cp -PR ${PKG_INSTALL}/* ${INSTALL}
 fi
 
 if [ "${TARGET}" = "target" ] ; then