diff --git a/build/conf/local.conf.sample b/build/conf/local.conf
old mode 100755
new mode 100644
similarity index 86%
rename from build/conf/local.conf.sample
rename to build/conf/local.conf
index 5de6ca64cc..83bd007f53
--- a/build/conf/local.conf.sample
+++ b/build/conf/local.conf
@@ -1,12 +1,12 @@
 # Where to cache the files OE downloads
-DL_DIR = "POKYROOT/sources"
-BBFILES := "POKYROOT/meta/packages/*/*.bb"
+DL_DIR = "${OEROOT}/sources"
+BBFILES = "${OEROOT}/meta/packages/*/*.bb"
 
 # To enable extra packages, uncomment the following lines:
-# BBFILES := "POKYROOT/meta/packages/*/*.bb POKYROOT/meta-extras/packages/*/*.bb"
+# BBFILES := "${OEROOT}/meta/packages/*/*.bb ${OEROOT}/meta-extras/packages/*/*.bb"
 # BBFILE_COLLECTIONS = "normal extras"
-# BBFILE_PATTERN_normal = "^POKYROOT/meta/"
-# BBFILE_PATTERN_extras = "^POKYROOT/meta/"
+# BBFILE_PATTERN_normal = "^${OEROOT}/meta/"
+# BBFILE_PATTERN_extras = "^${OEROOT}/meta/"
 # BBFILE_PRIORITY_normal = "5"
 # BBFILE_PRIORITY_extras = "5"
 
@@ -34,7 +34,7 @@ DISTRO_TYPE = "debug"
 # Note that a full build of everything in OpenEmbedded will take GigaBytes of hard
 # disk space, so make sure to free enough space. The default TMPDIR is
 # <build directory>/tmp
-# TMPDIR = /usr/local/projects/oetmp
+TMPDIR = "${OEROOT}/build/tmp"
 
 # Uncomment these two if you want BitBake to build images useful for debugging.
 # DEBUG_BUILD = "1"
diff --git a/poky-init-build-env b/poky-init-build-env
index 6cda775ffe..b9be03fb3c 100755
--- a/poky-init-build-env
+++ b/poky-init-build-env
@@ -49,12 +49,6 @@ if ! (test -d $BBDIR && test -d $PKGDIR && test -d $BUILDDIR); then
     exit 1
 fi
 
-if ! (test -r $BUILDDIR/conf/local.conf); then
-   cat $BUILDDIR/conf/local.conf.sample | sed -e"s|POKYROOT|${OEROOT}|g" > $BUILDDIR/conf/local.conf
-   echo
-   echo "..Created initial 'build/conf/local.conf'"
-fi	
-
 BBPATH=$BBDIR
 if test x"$BBDIR" != x"$PKGDIR"; then
 	BBPATH=$PKGDIR:$BBPATH
@@ -74,4 +68,4 @@ export LANG=C
 
 echo
 echo "### Shell environment set up for Poky builds. ###"
-echo 
\ No newline at end of file
+echo