diff --git a/conf/machine/nanopi-neo.conf b/conf/machine/nanopi-neo.conf
index e78414f..f2da361 100644
--- a/conf/machine/nanopi-neo.conf
+++ b/conf/machine/nanopi-neo.conf
@@ -4,8 +4,8 @@
 
 require conf/machine/include/sun8i.inc
 
-PREFERRED_VERSION_linux = "4.9.0+git%"
-PREFERRED_VERSION_u-boot = "v2016.11%"
+PREFERRED_VERSION_linux = "4.11.0+git%"
+PREFERRED_VERSION_u-boot = "v2017.03%"
 
 KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo.dtb"
 UBOOT_MACHINE = "nanopi_neo_defconfig"
diff --git a/conf/machine/orange-pi-one.conf b/conf/machine/orange-pi-one.conf
index 239525e..62b2641 100644
--- a/conf/machine/orange-pi-one.conf
+++ b/conf/machine/orange-pi-one.conf
@@ -4,8 +4,8 @@
 
 require conf/machine/include/sun8i.inc
 
-PREFERRED_VERSION_linux = "4.9.0+git%"
-PREFERRED_VERSION_u-boot = "v2016.11%"
+PREFERRED_VERSION_linux = "4.11.0+git%"
+PREFERRED_VERSION_u-boot = "v2017.03%"
 
 KERNEL_DEVICETREE = "sun8i-h3-orangepi-one.dtb"
 UBOOT_MACHINE = "orangepi_one_defconfig"
diff --git a/conf/machine/orange-pi-zero.conf b/conf/machine/orange-pi-zero.conf
new file mode 100644
index 0000000..1e9ac3f
--- /dev/null
+++ b/conf/machine/orange-pi-zero.conf
@@ -0,0 +1,13 @@
+#@TYPE: Machine
+#@NAME: orange-pi-one
+#@DESCRIPTION: Machine configuration for the orange-pi-one, base on allwinner H3 CPU
+
+require conf/machine/include/sun8i.inc
+
+PREFERRED_VERSION_linux = "4.11.0+git%"
+PREFERRED_VERSION_u-boot = "v2017.03%"
+
+KERNEL_DEVICETREE = "sun8i-h2-plus-orangepi-zero.dtb"
+UBOOT_MACHINE = "orangepi_zero_defconfig"
+
+DEFAULTTUNE = "cortexa7hf-neon-vfpv4"
diff --git a/conf/machine/pcduino.conf b/conf/machine/pcduino.conf
index dece19b..f0e77c6 100644
--- a/conf/machine/pcduino.conf
+++ b/conf/machine/pcduino.conf
@@ -4,8 +4,8 @@
 
 require conf/machine/include/sun4i.inc
 
-PREFERRED_VERSION_linux = "4.9.0+git%"
-PREFERRED_VERSION_u-boot = "v2016.11%"
+PREFERRED_VERSION_linux = "4.11.0+git%"
+PREFERRED_VERSION_u-boot = "v2017.03%"
 
 KERNEL_DEVICETREE = "sun4i-a10-pcduino.dtb"
 UBOOT_MACHINE = "Linksprite_pcDuino_defconfig"
diff --git a/recipes-bsp/u-boot/u-boot_2016.11.bb b/recipes-bsp/u-boot/u-boot_2017.03.bb
similarity index 94%
rename from recipes-bsp/u-boot/u-boot_2016.11.bb
rename to recipes-bsp/u-boot/u-boot_2017.03.bb
index a8c6888..88a86ad 100644
--- a/recipes-bsp/u-boot/u-boot_2016.11.bb
+++ b/recipes-bsp/u-boot/u-boot_2017.03.bb
@@ -29,9 +29,9 @@ DEFAULT_PREFERENCE_sun8i="1"
 SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
            file://boot.cmd"
 
-SRCREV = "29e0cfb4f77f7aa369136302cee14a91e22dca71"
+SRCREV = "8537ddd769f460d7fb7a62a3dcc9669049702e51"
 
-PV = "v2016.11+git${SRCPV}"
+PV = "v2017.03+git${SRCPV}"
 
 PE = "2"
 
diff --git a/recipes-kernel/linux/linux/defconfig b/recipes-kernel/linux/linux/defconfig
index 73192d8..a5ece2b 100644
--- a/recipes-kernel/linux/linux/defconfig
+++ b/recipes-kernel/linux/linux/defconfig
@@ -511,6 +511,7 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_POWER_RESET=y
 CONFIG_THERMAL=y
+CONFIG_THERMAL_OF=y
 CONFIG_CPU_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_SUNXI_WATCHDOG=y
diff --git a/recipes-kernel/linux/linux_git.bb b/recipes-kernel/linux/linux_git.bb
index 2311810..cab0402 100644
--- a/recipes-kernel/linux/linux_git.bb
+++ b/recipes-kernel/linux/linux_git.bb
@@ -18,9 +18,9 @@ DEFAULT_PREFERENCE = "-1"
 
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 	
-# 4.9.0
-PV = "4.9.0+git${SRCPV}"
-SRCREV_pn-${PN} = "69973b830859bc6529a7a0468ba0d80ee5117826"
+# 4.11.0-rc5
+PV = "4.11.0+git${SRCPV}"
+SRCREV_pn-${PN} = "81d4bab4ce87228c37ab14a885438544af5c9ce6"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;branch=master \
         file://defconfig \