diff --git a/config/path b/config/path
index 913a60282b..1e6dc1ae4f 100644
--- a/config/path
+++ b/config/path
@@ -91,17 +91,7 @@ SED="sed -i"
     [ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
   fi
 
-  if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
-    PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
-  elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
-    PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
-  elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
-    PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
-  elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
-    PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
-  elif [ -d "$BUILD/${PKG_NAME}" ]; then
-    PKG_BUILD="$BUILD/${PKG_NAME}"
-  fi
+  PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
 
 XORG_PATH_DRI=/usr/lib/dri
 XORG_PATH_XKB=/usr/share/X11/xkb
diff --git a/scripts/build b/scripts/build
index cac6e261d1..70086ed0e8 100755
--- a/scripts/build
+++ b/scripts/build
@@ -50,10 +50,6 @@ STAMP=$STAMPS/$PACKAGE_NAME/build_$TARGET
 
 $SCRIPTS/unpack $PACKAGE_NAME
 
-if [ -f $STAMP -a -f $PKG_DIR/need_build ]; then
-  $PKG_DIR/need_build $PACKAGE_NAME
-fi
-
 if [ -f $PKG_DIR/package.mk ]; then
   if [ -f $STAMP -a $PKG_DIR/package.mk -nt $STAMP ]; then
     rm -f $STAMP
@@ -236,20 +232,6 @@ if [ ! -f $STAMP ]; then
       # virtual packages dont must be build, they only contains dependencies, so dont go further here
       if [ ! "$PKG_SECTION" = "virtual" ]; then
 
-        if [ -z "$PKG_BUILD" ]; then
-          if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
-            PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
-          elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
-            PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
-          elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
-            PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
-          elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
-            PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
-          elif [ -d "$BUILD/${PKG_NAME}" ]; then
-            PKG_BUILD="$BUILD/${PKG_NAME}"
-          fi
-        fi
-
       # configure other variables
         if [ "$TARGET" = "target" ]; then
           INSTALL=$ROOT/$PKG_BUILD/.install_pkg
@@ -382,27 +364,29 @@ if [ ! -f $STAMP ]; then
         fi
 
         if [ "$TARGET" = "target" -o "$TARGET" = "init" ]; then
-          rm -rf $INSTALL/usr/include
-          rm -rf $INSTALL/usr/lib/pkgconfig
-          rm -rf $INSTALL/usr/share/aclocal
-          rm -rf $INSTALL/usr/share/bash-completion
-          rm -rf $INSTALL/usr/share/doc
-          rm -rf $INSTALL/usr/share/gtk-doc
-          rm -rf $INSTALL/usr/share/info
-          rm -rf $INSTALL/usr/share/locale
-          rm -rf $INSTALL/usr/share/man
-          rm -rf $INSTALL/usr/share/pkgconfig
-          find $INSTALL/lib -name "*.la" -exec rm -rf "{}" ";" 2>/dev/null || true
-          find $INSTALL/usr/lib -name "*.la" -exec rm -rf "{}" ";" 2>/dev/null || true
-          find $INSTALL/lib -name "*.a" -exec rm -rf "{}" ";" 2>/dev/null || true
-          find $INSTALL/usr/lib -name "*.a" -exec rm -rf "{}" ";" 2>/dev/null || true
-          find $INSTALL/lib -name "*.so*T" -exec rm -rf "{}" ";" 2>/dev/null || true
-          find $INSTALL/usr/lib -name "*.so*T" -exec rm -rf "{}" ";" 2>/dev/null || true
-          find $INSTALL -type d -exec rmdir -p "{}" ";" 2>/dev/null || true
+          if [ -d $INSTALL ] ; then
+            rm -rf $INSTALL/usr/include
+            rm -rf $INSTALL/usr/lib/pkgconfig
+            rm -rf $INSTALL/usr/share/aclocal
+            rm -rf $INSTALL/usr/share/bash-completion
+            rm -rf $INSTALL/usr/share/doc
+            rm -rf $INSTALL/usr/share/gtk-doc
+            rm -rf $INSTALL/usr/share/info
+            rm -rf $INSTALL/usr/share/locale
+            rm -rf $INSTALL/usr/share/man
+            rm -rf $INSTALL/usr/share/pkgconfig
+            find $INSTALL/lib -name "*.la" -exec rm -rf "{}" ";" 2>/dev/null || true
+            find $INSTALL/usr/lib -name "*.la" -exec rm -rf "{}" ";" 2>/dev/null || true
+            find $INSTALL/lib -name "*.a" -exec rm -rf "{}" ";" 2>/dev/null || true
+            find $INSTALL/usr/lib -name "*.a" -exec rm -rf "{}" ";" 2>/dev/null || true
+            find $INSTALL/lib -name "*.so*T" -exec rm -rf "{}" ";" 2>/dev/null || true
+            find $INSTALL/usr/lib -name "*.so*T" -exec rm -rf "{}" ";" 2>/dev/null || true
+            find $INSTALL -type d -exec rmdir -p "{}" ";" 2>/dev/null || true
 
-          if [ ! "$DEBUG" = yes ]; then
-           $STRIP `find $INSTALL -name "*.so"` 2>/dev/null || echo "Information: no *.so libs found"
-           $STRIP `find $INSTALL -name "*.so.[0-9]*"` 2>/dev/null || echo "Information: no *.so.[0-9]* libs found"
+            if [ ! "$DEBUG" = yes ]; then
+             $STRIP `find $INSTALL -name "*.so"` 2>/dev/null || echo "Information: no *.so libs found"
+             $STRIP `find $INSTALL -name "*.so.[0-9]*"` 2>/dev/null || echo "Information: no *.so.[0-9]* libs found"
+            fi
           fi
         fi
 
@@ -420,18 +404,6 @@ if [ ! -f $STAMP ]; then
       $SCRIPTS/autoreconf $PACKAGE_NAME
     fi
 
-    if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
-      PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
-    elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
-      PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
-    elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
-      PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
-    elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
-      PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
-    elif [ -d "$BUILD/${PKG_NAME}" ]; then
-      PKG_BUILD="$BUILD/${PKG_NAME}"
-    fi
-
     if [ -f $PKG_DIR/build ]; then
       $PKG_DIR/build $@ >&$VERBOSE_OUT
 
diff --git a/scripts/install b/scripts/install
index 526ea4f56c..4a1d5b5ccc 100755
--- a/scripts/install
+++ b/scripts/install
@@ -114,21 +114,6 @@ if [ -f $PKG_DIR/package.mk ]; then
   # include buildfile
     . $PKG_DIR/package.mk
 
-  # set PKG_BUILD variable
-    if [ -z "$PKG_BUILD" ]; then
-      if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
-        PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
-      elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
-        PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
-      elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
-        PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
-      elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
-        PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
-      elif [ -d "$BUILD/${PKG_NAME}" ]; then
-        PKG_BUILD="$BUILD/${PKG_NAME}"
-      fi
-    fi
-
   # install
     if [ "$(type -t pre_install)" = "function" ]; then
       pre_install
@@ -141,17 +126,6 @@ if [ -f $PKG_DIR/package.mk ]; then
       post_install
     fi
 elif [ -f $PKG_DIR/install ]; then
-  if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
-    PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
-  elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
-    PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
-  elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
-    PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
-  elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
-    PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
-  elif [ -d "$BUILD/${PKG_NAME}" ]; then
-    PKG_BUILD="$BUILD/${PKG_NAME}"
-  fi
   $PKG_DIR/install $@ >&$VERBOSE_OUT
 fi
 
diff --git a/scripts/unpack b/scripts/unpack
index 2039499534..e604589eeb 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -29,7 +29,6 @@ fi
 
 $SCRIPTS/get $1
 
-PKG_BUILD="$BUILD/$PKG_NAME-$PKG_VERSION"
 STAMP=$PKG_BUILD/.openelec-unpack
 
 mkdir -p $BUILD