diff --git a/recipes-bsp/u-boot/u-boot_git.bb b/recipes-bsp/u-boot/u-boot_git.bb
index fdf9cd5..91f3161 100644
--- a/recipes-bsp/u-boot/u-boot_git.bb
+++ b/recipes-bsp/u-boot/u-boot_git.bb
@@ -3,15 +3,16 @@ require recipes-bsp/u-boot/u-boot.inc
 LICENSE = "GPL"
 
 # No patches for other machines yet
-COMPATIBLE_MACHINE = "(mele|olinuxino-a13)"
+COMPATIBLE_MACHINE = "(mele|olinuxino-a13|cubieboard)"
 
 DEFAULT_PREFERENCE_mele= "1"
 DEFAULT_PREFERENCE_olinuxino-a13= "1"
+DEFAULT_PREFERENCE_cubieboard="1"
 
 SRC_URI = "git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi"
 
-SRCREV = "20efdee8e1e1807af7621e2dad0c23ba0b2186e7"
-PR = "r4"
+SRCREV = "7aa9f04f571247a6bb999c168b49e09f05b86465"
+PR = "r5"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
 
diff --git a/recipes-kernel/linux/linux_3.0.bb b/recipes-kernel/linux/linux_3.0.bb
index 163e7b2..f1d1869 100644
--- a/recipes-kernel/linux/linux_3.0.bb
+++ b/recipes-kernel/linux/linux_3.0.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Linux kernel for Allwinner a10 processors"
 
 KERNEL_IMAGETYPE = "uImage"
 
-COMPATIBLE_MACHINE = "(mele|olinuxino-a13)"
+COMPATIBLE_MACHINE = "(mele|olinuxino-a13|cubieboard)"
 
 PR = "6"