diff --git a/layers/meta-resin-allwinner/recipes-containers/docker-disk/resin-supervisor.bbappend b/layers/meta-resin-allwinner/recipes-containers/docker-disk/resin-supervisor.bbappend
index ba4b0c2..f1cdd4e 100644
--- a/layers/meta-resin-allwinner/recipes-containers/docker-disk/resin-supervisor.bbappend
+++ b/layers/meta-resin-allwinner/recipes-containers/docker-disk/resin-supervisor.bbappend
@@ -1,3 +1,4 @@
 LED_FILE_orange-pi-lite = "/sys/devices/platform/leds/leds/orangepi\:red\:status/brightness"
+LED_FILE_orange-pi-zero = "/sys/devices/platform/leds/leds/orangepi\:red\:status/brightness"
 
 LED_FILE_nanopi-neo-air = "/sys/class/leds/nanopi\:blue\:status/brightness"
diff --git a/layers/meta-resin-allwinner/recipes-core/images/resin-image.inc b/layers/meta-resin-allwinner/recipes-core/images/resin-image.inc
index d1d79ca..5742e5a 100644
--- a/layers/meta-resin-allwinner/recipes-core/images/resin-image.inc
+++ b/layers/meta-resin-allwinner/recipes-core/images/resin-image.inc
@@ -74,6 +74,25 @@ IMAGE_CMD_resinos-img_append_orange-pi-lite () {
     dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${RESIN_RAW_IMG} conv=notrunc seek=8 bs=1024
 }
 
+
+#
+# Orange Pi Zero
+#
+
+IMAGE_FSTYPES_append_orange-pi-zero = " resinos-img"
+
+#Customize resinos-img
+RESIN_IMAGE_BOOTLOADER_orange-pi-zero = "u-boot"
+RESIN_BOOT_PARTITION_FILES_orange-pi-zero = " \
+    ${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin:/${KERNEL_IMAGETYPE} \
+    uImage-sun8i-h2-plus-orangepi-zero.dtb:/dtb/sun8i-h2-plus-orangepi-zero.dtb \
+    u-boot-sunxi-with-spl.bin: \
+"
+IMAGE_CMD_resinos-img_append_orange-pi-zero () {
+    # Orange Pi Zero needs uboot written at a specific location
+    dd if=${DEPLOY_DIR_IMAGE}/u-boot-sunxi-with-spl.bin of=${RESIN_RAW_IMG} conv=notrunc seek=8 bs=1024
+}  
+
 #
 # nanopi-neo-air
 #
diff --git a/layers/meta-resin-allwinner/recipes-core/packagegroups/packagegroup-resin-connectivity.bbappend b/layers/meta-resin-allwinner/recipes-core/packagegroups/packagegroup-resin-connectivity.bbappend
index eb83289..7c28e90 100644
--- a/layers/meta-resin-allwinner/recipes-core/packagegroups/packagegroup-resin-connectivity.bbappend
+++ b/layers/meta-resin-allwinner/recipes-core/packagegroups/packagegroup-resin-connectivity.bbappend
@@ -1,4 +1,7 @@
 CONNECTIVITY_FIRMWARES_append = " linux-firmware-ap6212 linux-firmware-brcm43362"
 CONNECTIVITY_MODULES_append_orangepi-plus2 = " rtl8189"
 
+CONNECTIVITY_MODULES_append_orange-pi-zero = " xradio"
+CONNECTIVITY_FIRMWARES_append_orange-pi-zero = " xradio-firmware"
+
 CONNECTIVITY_FIRMWARES_append_nanopi-neo-air = " linux-firmware-bcm43430"
diff --git a/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend b/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend
index 81b74aa..b897662 100644
--- a/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend
+++ b/layers/meta-resin-allwinner/recipes-kernel/linux/linux-mainline_%.bbappend
@@ -18,6 +18,7 @@ RESIN_CONFIGS[axp_power] ="\
 "
 
 RESIN_CONFIGS_append_orangepi-plus2 = " wifi"
+RESIN_CONFIGS_append_orange-pi-zero = " wifi"
 RESIN_CONFIGS[wifi] ="\
     CONFIG_WIRELESS=y \
     CONFIG_RFKILL=y \
diff --git a/orange-pi-zero.coffee b/orange-pi-zero.coffee
new file mode 100644
index 0000000..ecb472f
--- /dev/null
+++ b/orange-pi-zero.coffee
@@ -0,0 +1,35 @@
+
+deviceTypesCommon = require '@resin.io/device-types/common'
+{ networkOptions, commonImg, instructions } = deviceTypesCommon
+
+module.exports =
+	version: 1
+	slug: 'orange-pi-zero'
+	name: 'Orange Pi Zero'
+	arch: 'armv7hf'
+	state: 'experimental'
+
+	instructions: commonImg.instructions
+	gettingStartedLink:
+		windows: 'https://docs.resin.io/orange-pi-one/nodejs/getting-started/#adding-your-first-device'
+		osx: 'https://docs.resin.io/orange-pi-one/nodejs/getting-started/#adding-your-first-device'
+		linux: 'https://docs.resin.io/orange-pi-one/nodejs/getting-started/#adding-your-first-device'
+	supportsBlink: true
+
+	options: [ networkOptions.group ]
+
+	yocto:
+		machine: 'orange-pi-zero'
+		image: 'resin-image'
+		fstype: 'resinos-img'
+		version: 'yocto-sumo'
+		deployArtifact: 'resin-image-orange-pi-zero.resinos-img'
+		compressed: true
+
+	configuration:
+		config:
+			partition:
+				primary: 1
+			path: '/config.json'
+
+	initialization: commonImg.initialization
\ No newline at end of file