diff --git a/conf/machine/allwinner-a10.conf b/conf/machine/allwinner-a10.conf
index e3f3a67..f47f90c 100644
--- a/conf/machine/allwinner-a10.conf
+++ b/conf/machine/allwinner-a10.conf
@@ -20,13 +20,13 @@ PREFERRED_VERSION_linux-libc-headers = "3.0.8"
 
 KERNEL_IMAGETYPE = "uImage"
 
-UBOOT_MACHINE = "sun4i"
+UBOOT_MACHINE = "mele_a1000"
 UBOOT_ENTRYPOINT = "0x40008000"
 UBOOT_LOADADDRESS = "0x40008000"
 
-SPL_BINARY = "sun4i-spl.bin"
+SPL_BINARY = "sunxi-spl.bin"
 
-IMAGE_FSTYPES += "tar.bz2 squashfs"
+IMAGE_FSTYPES += "tar.bz2 squashfs a10-sdimg"
 
 # Guesswork
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/recipes-bsp/u-boot/u-boot_git.bb b/recipes-bsp/u-boot/u-boot_git.bb
index 5552bbb..2181a9c 100644
--- a/recipes-bsp/u-boot/u-boot_git.bb
+++ b/recipes-bsp/u-boot/u-boot_git.bb
@@ -7,17 +7,16 @@ COMPATIBLE_MACHINE = "allwinner-a10"
 
 DEFAULT_PREFERENCE_allwinner-a10 = "1"
 
-SRC_URI = "git://github.com/hno/uboot-allwinner.git;protocol=git;branch=sun4i \
+SRC_URI = "git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi \
           "
 
-# 2012/06/05: Merge branch 'sun4i' of github.com:hno/uboot-allwinner into sun4i
-SRCREV = "ef96cd035ce543d1f8d656bf200ca8a62731c3f1"
-PR = "r2"
+SRCREV = "b255c5fbe07afd488160ca67c1290955553a25e8"
+PR = "r3"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
 
 S = "${WORKDIR}/git"
 
 do_install_prepend() {
-	cp ${S}/spl/sun4i-spl.bin ${S}
+	cp ${S}/spl/sunxi-spl.bin ${S}
 }