diff --git a/buildconf/bbb-init-build-env b/buildconf/bbb-init-build-env
new file mode 100644
index 0000000..c587df6
--- /dev/null
+++ b/buildconf/bbb-init-build-env
@@ -0,0 +1,7 @@
+OPT_M=beaglebone-yocto
+BUILD_DIR=build
+
+source layers/meta-blackfinn/default-init-build-env $BUILD_DIR
+
+return 0
+
diff --git a/buildconf/default-init-build-env b/buildconf/default-init-build-env
new file mode 100644
index 0000000..fc6baab
--- /dev/null
+++ b/buildconf/default-init-build-env
@@ -0,0 +1,18 @@
+OPTIND=1
+shift $((OPTIND-1))
+for NOPTARG in $*; do
+	BUILD_DIR="$NOPTARG"
+done
+
+export TEMPLATECONF="../meta-rpi/buildconf"
+
+export MACHINE=$OPT_M
+rm -f	build/conf/bblayers.conf \
+	build/conf/templateconf.cfg
+
+mkdir -p $BUILD_DIR
+
+source layers/poky/oe-init-build-env $BUILD_DIR
+
+return 0
+
diff --git a/buildconf/rpi-init-build-env b/buildconf/rpi-init-build-env
new file mode 100644
index 0000000..1b5e5ba
--- /dev/null
+++ b/buildconf/rpi-init-build-env
@@ -0,0 +1,8 @@
+# Defaults
+OPT_M=raspberrypi3-64
+BUILD_DIR=build
+
+source layers/meta-blackfinn/default-init-build-env $BUILD_DIR
+
+return 0
+