diff --git a/conf/machine/olinuxino-a10s.conf b/conf/machine/olinuxino-a10s.conf
index 645e9aa..dd63825 100644
--- a/conf/machine/olinuxino-a10s.conf
+++ b/conf/machine/olinuxino-a10s.conf
@@ -6,5 +6,5 @@
 require conf/machine/include/sun5i.inc
 
 KERNEL_DEVICETREE = "sun5i-a10s-olinuxino-micro.dtb"
-UBOOT_MACHINE = "A10s-OLinuXino-Micro_config"
+UBOOT_MACHINE = "A10s-OLinuXino-M_config"
 SUNXI_FEX_FILE = "sys_config/a10s/a10s-olinuxino-m.fex"
\ No newline at end of file
diff --git a/conf/machine/olinuxino-a20.conf b/conf/machine/olinuxino-a20.conf
index 4674b73..f644af6 100644
--- a/conf/machine/olinuxino-a20.conf
+++ b/conf/machine/olinuxino-a20.conf
@@ -6,5 +6,5 @@
 require conf/machine/include/sun7i.inc
 
 KERNEL_DEVICETREE = "sun7i-a20-olinuxino-lime.dtb"
-UBOOT_MACHINE = "A20-OLinuXino-Micro_config"
+UBOOT_MACHINE = "A20-OLinuXino_MICRO_config"
 SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_micro.fex"
\ No newline at end of file
diff --git a/recipes-bsp/u-boot/u-boot-sunxi.bb b/recipes-bsp/u-boot/u-boot-sunxi.bb
index d95660a..761ba8d 100644
--- a/recipes-bsp/u-boot/u-boot-sunxi.bb
+++ b/recipes-bsp/u-boot/u-boot-sunxi.bb
@@ -13,6 +13,10 @@ DEFAULT_PREFERENCE_sun4i="1"
 DEFAULT_PREFERENCE_sun5i="1"
 DEFAULT_PREFERENCE_sun7i="1"
 
+# Sunxi U-Boot uses different names for some boards
+UBOOT_MACHINE_olinuxino-a20 = "A20-OLinuXino-Micro_config"
+UBOOT_MACHINE_olinuxino-a10s = "A10s-OLinuXino-Micro_config"
+
 SRC_URI = "git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi"
 
 PE = "1"
diff --git a/recipes-bsp/u-boot/u-boot_2015.07rc2.bb b/recipes-bsp/u-boot/u-boot_2015.07.bb
similarity index 82%
rename from recipes-bsp/u-boot/u-boot_2015.07rc2.bb
rename to recipes-bsp/u-boot/u-boot_2015.07.bb
index 25bf338..c719390 100644
--- a/recipes-bsp/u-boot/u-boot_2015.07rc2.bb
+++ b/recipes-bsp/u-boot/u-boot_2015.07.bb
@@ -25,15 +25,11 @@ DEFAULT_PREFERENCE_sun4i="1"
 DEFAULT_PREFERENCE_sun5i="1"
 DEFAULT_PREFERENCE_sun7i="1"
 
-# Mainline U-Boot uses different names for some boards
-UBOOT_MACHINE_olinuxino-a20 = "A20-OLinuXino_MICRO_config"
-UBOOT_MACHINE_olinuxino-a10s = "A10s-OLinuXino-M_config"
-
 SRC_URI += "file://boot.cmd"
 
-SRCREV = "dfc8bb1f16f7d7c20b7446da95c23f247a02e583"
+SRCREV = "33711bdd4a4dce942fb5ae85a68899a8357bdd94"
 
-PV = "v2015.07-rc2${SRCPV}"
+PV = "v2015.07${SRCPV}"
 
 PE = "1"