diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf
index 775c8c1..6e95291 100644
--- a/conf/machine/raspberrypi.conf
+++ b/conf/machine/raspberrypi.conf
@@ -12,7 +12,7 @@ IMAGE_FSTYPES ?= "tar.bz2 ext3 rpi-sdimg"
 
 SERIAL_CONSOLE = "115200 ttyAMA0"
 
-MACHINE_KERNEL_PR = "r4"
+MACHINE_KERNEL_PR = "r5"
 
 XSERVER = " \
 	xserver-xorg \
@@ -32,6 +32,3 @@ MACHINE_FEATURES_BACKFILL_CONSIDERED = "rtc"
 MACHINE_EXTRA_RRECOMMENDS += " \
 	kernel-modules \
 "
-
-# Set default GPU firmware image to be shipped
-RPI_GPU_FIRMWARE ?= "arm192"