diff --git a/scripts/unpack b/scripts/unpack
index 9338bbed27..425c2d11a7 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -74,27 +74,65 @@ fi
 printf "%${BUILD_INDENT}c ${boldcyan}UNPACK${endcolor}   $1\n" ' '>&$SILENT_OUT
 export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
 
-# todo: deprecated
-[ -f "$PKG_DIR/unpack" ] && $PKG_DIR/unpack $@ >&$VERBOSE_OUT
+if [ -f $PKG_DIR/package.mk ]; then
+  # unset functions
+  unset -f pre_unpack
+  unset -f unpack
+  unset -f post_unpack
 
-if [ -n "$PKG_URL" ]; then
-  $SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD
-  $SCRIPTS/extract $1 "$1*.tbz"     $BUILD
-  $SCRIPTS/extract $1 "$1*.tar.gz"  $BUILD
-  $SCRIPTS/extract $1 "$1*.tar.xz"  $BUILD
-  $SCRIPTS/extract $1 "$1*.txz"     $BUILD
-  $SCRIPTS/extract $1 "$1*.tgz"     $BUILD
-  $SCRIPTS/extract $1 "$1*.7z"      $BUILD
-  $SCRIPTS/extract $1 "$1*.zip"     $BUILD
-fi
+  . $PKG_DIR/package.mk
 
-if [ -n "$PKG_SOURCE_DIR" ]; then
-  mv $BUILD/$PKG_SOURCE_DIR $BUILD/$PKG_NAME-$PKG_VERSION
-fi
+  if [ "$(type -t pre_unpack)" = "function" ]; then
+    pre_unpack
+  fi
 
-if [ -d "$PKG_DIR/sources" ]; then
-  [ ! -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ] && mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
-  cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION}
+  if [ "$(type -t unpack)" = "function" ]; then
+    unpack
+  else
+    if [ -n "$PKG_URL" ]; then
+      $SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD
+      $SCRIPTS/extract $1 "$1*.tbz"     $BUILD
+      $SCRIPTS/extract $1 "$1*.tar.gz"  $BUILD
+      $SCRIPTS/extract $1 "$1*.tar.xz"  $BUILD
+      $SCRIPTS/extract $1 "$1*.txz"     $BUILD
+      $SCRIPTS/extract $1 "$1*.tgz"     $BUILD
+      $SCRIPTS/extract $1 "$1*.7z"      $BUILD
+      $SCRIPTS/extract $1 "$1*.zip"     $BUILD
+    fi
+  fi
+
+  if [ -n "$PKG_SOURCE_DIR" ]; then
+    mv $BUILD/$PKG_SOURCE_DIR $BUILD/$PKG_NAME-$PKG_VERSION
+  fi
+
+  if [ -d "$PKG_DIR/sources" ]; then
+    [ ! -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ] && mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
+    cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION}
+  fi
+else  # todo: deprecated
+  if [ -f "$PKG_DIR/unpack" ]; then
+    $PKG_DIR/unpack $@ >&$VERBOSE_OUT
+  fi
+
+  if [ -n "$PKG_URL" ]; then
+    $SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD
+    $SCRIPTS/extract $1 "$1*.tbz"     $BUILD
+    $SCRIPTS/extract $1 "$1*.tar.gz"  $BUILD
+    $SCRIPTS/extract $1 "$1*.tar.xz"  $BUILD
+    $SCRIPTS/extract $1 "$1*.txz"     $BUILD
+    $SCRIPTS/extract $1 "$1*.tgz"     $BUILD
+    $SCRIPTS/extract $1 "$1*.7z"      $BUILD
+    $SCRIPTS/extract $1 "$1*.zip"     $BUILD
+  fi
+
+  if [ -n "$PKG_SOURCE_DIR" ]; then
+    mv $BUILD/$PKG_SOURCE_DIR $BUILD/$PKG_NAME-$PKG_VERSION
+  fi
+
+  if [ -d "$PKG_DIR/sources" ]; then
+    [ ! -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ] && mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
+    cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION}
+  fi
 fi
 
 for i in $PKG_DIR/patches/$PKG_NAME-*.patch ; do
@@ -144,11 +182,6 @@ done
 # - now replaced by $PKG_SOURCE_DIR .
 # - now moved after patching to replace the formerly 'unpack' script
 if [ -f $PKG_DIR/package.mk ]; then
-  # unset functions
-  unset -f post_unpack
-
-  . $PKG_DIR/package.mk
-
   if [ "$(type -t post_unpack)" = "function" ]; then
     post_unpack
   fi
@@ -166,8 +199,6 @@ done
 rm -f $STAMPS/$1/build_*
 
 if [ -f "$PKG_DIR/package.mk" ]; then
-  . $PKG_DIR/package.mk
-
   for i in PKG_NAME PKG_VERSION PKG_REV PKG_SHORTDESC PKG_LONGDESC PKG_SITE PKG_URL PKG_SECTION; do
     eval val=\$$i
     echo "STAMP_$i=\"$val"\" >> $STAMP