diff --git a/buildroot/.config b/buildroot/.config
index a3066f61..e1917807 100644
--- a/buildroot/.config
+++ b/buildroot/.config
@@ -307,8 +307,8 @@ BR2_LINUX_KERNEL_CUSTOM_GIT=y
 # BR2_LINUX_KERNEL_CUSTOM_HG is not set
 # BR2_LINUX_KERNEL_CUSTOM_LOCAL is not set
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/raspberrypi/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f70eae405b5d75f7c41ea300b9f790656f99a203"
-BR2_LINUX_KERNEL_VERSION="f70eae405b5d75f7c41ea300b9f790656f99a203"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="12d78096b1669a08d440f7ebaddf5d925e52fe79"
+BR2_LINUX_KERNEL_VERSION="12d78096b1669a08d440f7ebaddf5d925e52fe79"
 BR2_LINUX_KERNEL_PATCH="linux-regdb.patch"
 # BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
diff --git a/buildroot/package/rpi-firmware/rpi-firmware.mk b/buildroot/package/rpi-firmware/rpi-firmware.mk
index 6343ba41..da4e9b03 100644
--- a/buildroot/package/rpi-firmware/rpi-firmware.mk
+++ b/buildroot/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 5db8e4e1c63178e200d6fbea23ed4a9bf4656658
+RPI_FIRMWARE_VERSION = fbad6408c4596d3d671736ee0571aae444f24e68
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
diff --git a/buildroot/package/rpi-userland/rpi-userland.mk b/buildroot/package/rpi-userland/rpi-userland.mk
index 3a34487c..914291a0 100644
--- a/buildroot/package/rpi-userland/rpi-userland.mk
+++ b/buildroot/package/rpi-userland/rpi-userland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = e9e90c674e8c8ddeea9e8b90b3feae89b8b90afe
+RPI_USERLAND_VERSION = de4a7f2e3c391e2d3bc76af31864270e7802d9ac
 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
 RPI_USERLAND_LICENSE = BSD-3c
 RPI_USERLAND_LICENSE_FILES = LICENCE
diff --git a/recovery/config.h b/recovery/config.h
index 3a107c7d..60433881 100644
--- a/recovery/config.h
+++ b/recovery/config.h
@@ -2,7 +2,7 @@
 #define CONFIG_H
 
 /* Version number displayed in the title bar */
-#define VERSION_NUMBER "2.8"
+#define VERSION_NUMBER "2.9"
 
 /* Color of the background */
 // #define BACKGROUND_COLOR  Qt::white