diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal
index b1e5546bba..93a1400f0c 100755
--- a/scripts/poky-env-internal
+++ b/scripts/poky-env-internal
@@ -26,7 +26,7 @@ OEROOT=`pwd`
 
 BBDIR=$OEROOT/bitbake/
 PKGDIR=$OEROOT/meta/
-BUILDDIR=$OEROOT/build/
+BUILDDIR=$OEROOT/$1/
 MSG=''
 
 BUILD_ARCH=`uname -m`
@@ -55,7 +55,7 @@ BBPATH=$BBDIR
 if test x"$BBDIR" != x"$PKGDIR"; then
 	BBPATH=$PKGDIR:$BBPATH
 fi
-BBPATH="`readlink -f $HOME/.oe`:`readlink -f $HOME/.poky`:$BBPATH"
+BBPATH="`readlink -f $HOME/.oe`:`readlink -f $HOME/.poky`:$BBPATH:$OEROOT/poky-prvt/trunk"
 if test x"$PKGDIR" != x"$BUILDDIR"; then
 	BBPATH=$BUILDDIR:$BBPATH
 fi
diff --git a/scripts/runqemu b/scripts/runqemu
index a3bb777bbc..c8546ddadf 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -68,7 +68,12 @@ fi
 if [ "$MACHINE" = "qemuarm" ]; then
     if [ "$TYPE" = "ext2" ]; then
         if [ "x$HDIMAGE" = "x" ]; then
-           HDIMAGE=$BUILDDIR/tmp/deploy/images/poky-image-sdk-qemuarm.ext2
+            T=$BUILDDIR/tmp/deploy/images/poky-image-
+	    if [ -x "$T-sdk-qemuarm.ext2" ]; then
+                HDIMAGE=$T-sdk-qemuarm.ext2
+	    elif [ -x "$T-pda-qemuarm.ext2" ]; then
+                HDIMAGE=$T-pda-qemuarm.ext2
+	    fi
         fi
     fi
 fi
@@ -95,7 +100,12 @@ if [ "$MACHINE" = "qemux86" ]; then
     fi
     if [ "$TYPE" = "ext2" ]; then
         if [ "x$HDIMAGE" = "x" ]; then
-           HDIMAGE=$BUILDDIR/tmp/deploy/images/poky-image-sdk-qemux86.ext2
+            T=$BUILDDIR/tmp/deploy/images/poky-image-
+	    if [ -x "$T-sdk-qemux86.ext2" ]; then
+                HDIMAGE=$T-sdk-qemux86.ext2
+	    elif [ -x "$T-pda-qemux86.ext2" ]; then
+                HDIMAGE=$T-pda-qemux86.ext2
+            fi
         fi
     fi
     CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux/bin