diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index 9de7b05108..05c6cd8ce1 100755
--- a/scripts/oe-buildenv-internal
+++ b/scripts/oe-buildenv-internal
@@ -54,7 +54,11 @@ else
 fi
 unset BDIR
 
-BITBAKEDIR="$OEROOT/bitbake$BBEXTRA/"
+if [ "x$2" = "x" ]; then
+    BITBAKEDIR="$OEROOT/bitbake$BBEXTRA/"
+else
+    BITBAKEDIR="$2"
+fi
 
 BITBAKEDIR=`readlink -f "$BITBAKEDIR"`
 BUILDDIR=`readlink -f "$BUILDDIR"`