diff --git a/build/conf/local.conf b/build/conf/local.conf.sample
similarity index 100%
rename from build/conf/local.conf
rename to build/conf/local.conf.sample
diff --git a/poky-init-build-env b/poky-init-build-env
index b8ddc64dc5..c2f2c04406 100755
--- a/poky-init-build-env
+++ b/poky-init-build-env
@@ -49,6 +49,10 @@ if ! (test -d $BBDIR && test -d $PKGDIR && test -d $BUILDDIR); then
     exit 1
 fi
 
+if ! (test -r $BUILDDIR/conf/local.conf); then
+    cp -f $BUILDDIR/conf/local.conf.sample $BUILDDIR/conf/local.conf
+fi
+
 BBPATH=$BBDIR
 if test x"$BBDIR" != x"$PKGDIR"; then
 	BBPATH=$PKGDIR:$BBPATH