diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf
index b72105d..f3b33bb 100755
--- a/conf/machine/raspberrypi.conf
+++ b/conf/machine/raspberrypi.conf
@@ -9,12 +9,12 @@ require conf/machine/include/tune-arm1176jzf-s.inc
 
 GUI_MACHINE_CLASS = "bigscreen"
 
-IMAGE_FSTYPES += "tar.bz2"
+IMAGE_FSTYPES += "tar.bz2 rpi-sdimg"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
-MACHINE_KERNEL_PR = "r2"
+MACHINE_KERNEL_PR = "r4"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 
@@ -32,5 +32,5 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen tou
 
 MACHINE_EXTRA_RRECOMMENDS += " \
 	kernel-modules \
-	raspberrypi-firmware \
+	bcm2835-kernel-image \
 "
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.1.9.bb b/recipes-kernel/linux/linux-raspberrypi_3.1.9.bb
index 8a61f89..8a24051 100755
--- a/recipes-kernel/linux/linux-raspberrypi_3.1.9.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_3.1.9.bb
@@ -4,10 +4,11 @@ require linux.inc
 
 DESCRIPTION = "Linux kernel for the RaspberryPi board"
 
+# Bump MACHINE_KERNEL_PR in the machine config if you update the kernel.
 # This is on the rpi-patches branch
-SRCREV = "2fb814968753d0d4a5fdf056a3a8c9eee3c41aa6"
+SRCREV = "0ec4154d64ebba48ca2446cde60a90546311defc"
 
-SRC_URI = "git://github.com/djwillis/rpi-linux.git;protocol=git;branch=rpi-patches \
+SRC_URI = "git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-patches \
 "          
 
 LINUX_VERSION ?= "3.1.9-rpi"