diff --git a/README.md b/README.md
index 6352746..1780241 100644
--- a/README.md
+++ b/README.md
@@ -14,9 +14,27 @@ $ repo sync
 ## Set Environment
 
 ```shell
-$ source [bbb/rpi]-init-build-env
+$ MACHINE=<machineconf> source blackfinn-init-build-env-init-build-env
 ```
 
+Supported machineconfs:
+
+* qemuarm
+* qemuarm64
+* qemumips
+* qemumips64
+* qemuppc
+* qemux86
+* qemux86-64
+* beaglebone-yocto
+* edgerouter
+* genericx86
+* genericx86-64
+* mpc8315e-rdb
+* raspberrypi3-64
+* bananapi-m3
+
+
 ## Build the Image
 ```shell
 $ bitbake console-image
diff --git a/default.xml b/default.xml
index c71bfd9..4b6b81d 100644
--- a/default.xml
+++ b/default.xml
@@ -5,16 +5,14 @@
 	<remote name="yo" fetch="git://git.yoctoproject.org"/>
 	<remote name="oe" fetch="git://git.openembedded.org"/>
 	<remote name="bf" fetch="https://git.blackfinn.de/yocto"/>
+	<remote name="sx" fetch="https://github.com/linux-sunxi"/>
 
-	<project name="poky"              remote="yo" revision="thud" clone-depth="1" path="layers/poky"/>
-	<project name="meta-raspberrypi"  remote="yo" revision="thud" clone-depth="1" path="layers/meta-raspberrypi"/>
-	<project name="meta-openembedded" remote="oe" revision="thud" clone-depth="1" path="layers/meta-openembedded"/>
-
-	<project name="meta-bbb"          remote="bf" revision="thud" path="layers/meta-bbb"/>
-	<project name="meta-rpi"          remote="bf" revision="thud" path="layers/meta-rpi"/>
+	<project name="poky" remote="yo"  revision="thud" path="layers/poky"                          clone-depth="1"/>
+	<project name="meta-openembedded" remote="oe" revision="thud" path="layers/meta-openembedded" clone-depth="1"/>
+        <project name="meta-raspberrypi"  remote="yo" revision="thud" path="layers/meta-raspberrypi"  clone-depth="1"/>
+	<project name="meta-sunxi"        remote="sx" revision="thud" path="layers/meta-sunxi"        clone-depth="1"/>
 	<project name="meta-blackfinn"    remote="bf" revision="thud" path="layers/meta-blackfinn">
-		<linkfile dest="bbb-init-build-env" src="buildconf/bbb-init-build-env"/>
-		<linkfile dest="rpi-init-build-env" src="buildconf/rpi-init-build-env"/>
+		<linkfile dest="blackfinn-init-build-env" src="buildconf/blackfinn-init-build-env"/>
 	</project>
 </manifest>