diff --git a/config/functions b/config/functions
index c74cdd340b..dbfcf1eb98 100644
--- a/config/functions
+++ b/config/functions
@@ -104,23 +104,11 @@ setup_toolchain() {
 }
 
 kernel_path() {
-  if [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
-    . $ROOT/projects/$PROJECT/packages/linux/package.mk
-  else
-    . $ROOT/packages/linux/package.mk
-  fi
-
-  echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
+  get_build_dir linux
 }
 
 kernel_version() {
-  if [ -e $ROOT/projects/$PROJECT/packages/linux/package.mk ]; then
-    . $ROOT/projects/$PROJECT/packages/linux/package.mk
-  else
-    . $ROOT/packages/linux/package.mk
-  fi
-
-  echo ${PKG_VERSION}
+  get_pkg_version linux
 }
 
 # get kernel module dir
@@ -130,30 +118,30 @@ get_module_dir() {
 
 # get package's build dir
 get_build_dir() {
-  if [ ! -z $1 ] ; then
-    local _PKG_DIR=$(find $ROOT/projects/$PROJECT/packages -name $1 2>/dev/null)
-    if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
-      . $_PKG_DIR/package.mk
-    else
-      local _PKG_DIR=$(find $ROOT/packages -name $1 2>/dev/null)
-      if [ -d "$_PKG_DIR" -a -f $_PKG_DIR/package.mk ] ; then
-        . $_PKG_DIR/package.mk
-      fi
-    fi
-
-    echo $ROOT/$BUILD/${PKG_NAME}-${PKG_VERSION}
+  local _PKG_NAME="$(get_pkg_variable "$1" PKG_NAME)" _PKG_VERSION="$(get_pkg_version "$1")"
+  if [ -n "$_PKG_NAME" -a -n "$_PKG_VERSION" ]; then
+    echo $ROOT/$BUILD/${_PKG_NAME}-${_PKG_VERSION}
   fi
 }
 
 get_pkg_version() {
-  if [ ! -z $1 ] ; then
+  get_pkg_variable "$1" PKG_VERSION
+}
+
+get_pkg_directory() {
+  get_pkg_variable "$1" PKG_DIR
+}
+
+# get variable ($2) for package ($1)
+get_pkg_variable() {
+  if [ -n "$1" -a -n "$2" ] ; then
     cd $ROOT
     . config/options $1
-    echo "$PKG_VERSION"
+    echo "${!2}"
   fi
 }
 
-tolower(){
+tolower() {
   echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
 }
 
diff --git a/packages/x11/xserver/xorg-server/package.mk b/packages/x11/xserver/xorg-server/package.mk
index 6c12bdd54f..f354b679a8 100644
--- a/packages/x11/xserver/xorg-server/package.mk
+++ b/packages/x11/xserver/xorg-server/package.mk
@@ -145,11 +145,8 @@ post_makeinstall_target() {
 
   mkdir -p $INSTALL/usr/lib/xorg
     cp -P $PKG_DIR/scripts/xorg-configure $INSTALL/usr/lib/xorg
-      . $ROOT/packages/x11/driver/xf86-video-nvidia/package.mk
-      sed -i -e "s|@NVIDIA_VERSION@|${PKG_VERSION}|g" $INSTALL/usr/lib/xorg/xorg-configure
-      . $ROOT/packages/x11/driver/xf86-video-nvidia-legacy/package.mk
-      sed -i -e "s|@NVIDIA_LEGACY_VERSION@|${PKG_VERSION}|g" $INSTALL/usr/lib/xorg/xorg-configure
-      . $ROOT/packages/x11/xserver/xorg-server/package.mk
+      sed -i -e "s|@NVIDIA_VERSION@|$(get_pkg_version xf86-video-nvidia)|g" $INSTALL/usr/lib/xorg/xorg-configure
+      sed -i -e "s|@NVIDIA_LEGACY_VERSION@|$(get_pkg_version xf86-video-nvidia-legacy)|g" $INSTALL/usr/lib/xorg/xorg-configure
 
   if [ ! "$OPENGL" = "no" ]; then
     if [ -f $INSTALL/usr/lib/xorg/modules/extensions/libglx.so ]; then
diff --git a/scripts/image b/scripts/image
index dd7ddcecaf..693a07d8ef 100755
--- a/scripts/image
+++ b/scripts/image
@@ -273,16 +273,9 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
   rm -rf $TARGET_IMG/$IMAGE_NAME.img.gz
   if [ -n "$BOOTLOADER" ]; then
 
-    BOOTLOADER_DIR=""
-    if [ -z "$BOOTLOADER_DIR" -a -d $PROJECT_DIR/$PROJECT/packages ]; then
-      BOOTLOADER_DIR=`find $PROJECT_DIR/$PROJECT/packages -type d -name $BOOTLOADER 2>/dev/null`
-    fi
+    BOOTLOADER_DIR="$(get_pkg_directory "$BOOTLOADER")"
 
-    if [ -z "$BOOTLOADER_DIR" -o ! -d "$BOOTLOADER_DIR" ]; then
-      BOOTLOADER_DIR=`find $PACKAGES -type d -name $BOOTLOADER 2>/dev/null`
-    fi
-
-    if [ -d "$BOOTLOADER_DIR"/files ]; then
+    if [ -d $BOOTLOADER_DIR/files ]; then
       cp -R $BOOTLOADER_DIR/files/* $RELEASE_DIR
     fi
 
@@ -290,7 +283,7 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
       . $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/release
     elif [ -f $PROJECT_DIR/$PROJECT/bootloader/release ]; then
       . $PROJECT_DIR/$PROJECT/bootloader/release
-    elif [ -f "$BOOTLOADER_DIR"/release ]; then
+    elif [ -f $BOOTLOADER_DIR/release ]; then
       . $BOOTLOADER_DIR/release
     fi
   fi
@@ -480,8 +473,8 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
     # create System dir
     mkdir -p $RELEASE_DIR/${DISTRONAME}_${PROJECT}/System
 
-    BOOTLOADER_DIR=`find $PACKAGES -type d -name $BOOTLOADER 2>/dev/null`
-    if [ -d "$BOOTLOADER_DIR"/files/3rdparty/bootloader/ ]; then
+    BOOTLOADER_DIR="$(get_pkg_directory "$BOOTLOADER")"
+    if [ -d $BOOTLOADER_DIR/files/3rdparty/bootloader/ ]; then
       cp -PR $BOOTLOADER_DIR/files/3rdparty/bootloader/* $RELEASE_DIR/${DISTRONAME}_${PROJECT}/System
     fi