diff --git a/conf/machine/cubieboard.conf b/conf/machine/cubieboard.conf
index c0e9e86..c745d05 100644
--- a/conf/machine/cubieboard.conf
+++ b/conf/machine/cubieboard.conf
@@ -21,12 +21,14 @@ PREFERRED_VERSION_linux-libc-headers = "3.0.8"
 KERNEL_IMAGETYPE = "uImage"
 
 UBOOT_MACHINE = "cubieboard"
-UBOOT_ENTRYPOINT = "0x48000000"
-UBOOT_LOADADDRESS = "0x48000000"
+UBOOT_ENTRYPOINT = "0x40008000"
+UBOOT_LOADADDRESS = "0x40008000"
 
 SPL_BINARY = "sunxi-spl.bin"
 
-IMAGE_FSTYPES += "tar.bz2 squashfs a10-sdimg"
+IMAGE_CLASSES += "sdcard_image-a10"
+IMAGE_FSTYPES += "ext3 a10-sdimg"
+
 
 # Guesswork
 SERIAL_CONSOLE = "115200 ttyS0"