diff --git a/scripts/build b/scripts/build
index c8592f6717..f8e2aa9db7 100755
--- a/scripts/build
+++ b/scripts/build
@@ -53,11 +53,6 @@ if [ -f ${STAMP} ]; then
   rm -f ${STAMP}
 fi
 
-if [ -n "${PKG_DEPENDS_UNPACK}" ]; then
-  for p in ${PKG_DEPENDS_UNPACK}; do
-    ${SCRIPTS}/unpack "${p}" "${PARENT_PKG}"
-  done
-fi
 ${SCRIPTS}/unpack "${PKG_NAME}" "${PARENT_PKG}"
 
 # build dependencies, only when PKG_DEPENDS_? is filled
diff --git a/scripts/unpack b/scripts/unpack
index 2224e8f4e3..d3aa480329 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -17,9 +17,11 @@ PARENT_PKG="${2:-${PKG_NAME}}"
 
 pkg_lock "${PKG_NAME}" "unpack" "${PARENT_PKG}"
 
-pkg_lock_status "ACTIVE" "${PKG_NAME}" "unpack"
-
-${SCRIPTS}/get "${PKG_NAME}"
+if [ -n "${PKG_DEPENDS_UNPACK}" ]; then
+  for p in ${PKG_DEPENDS_UNPACK}; do
+    ${SCRIPTS}/unpack "${p}" "${PARENT_PKG}"
+  done
+fi
 
 STAMP="${PKG_BUILD}/.libreelec-unpack"
 
@@ -49,6 +51,10 @@ if [ -f "${STAMP}" ]; then
   exit 0
 fi
 
+pkg_lock_status "ACTIVE" "${PKG_NAME}" "unpack"
+
+${SCRIPTS}/get "${PKG_NAME}"
+
 if [ -d "${SOURCES}/${PKG_NAME}" -o -d "${PKG_DIR}/sources" ]; then
   build_msg "CLR_UNPACK" "UNPACK" "${PKG_NAME}" "indent"