diff --git a/buildroot/.config b/buildroot/.config
index 83bac713..a4249964 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="fa00f31867d8f7b7bb2ad2eb6c35f32fa468ca1e"
-BR2_LINUX_KERNEL_VERSION="fa00f31867d8f7b7bb2ad2eb6c35f32fa468ca1e"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8d1dd639a4db6ccc416bb0a00afc7a8888018b3d"
+BR2_LINUX_KERNEL_VERSION="8d1dd639a4db6ccc416bb0a00afc7a8888018b3d"
 BR2_LINUX_KERNEL_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 3b780d89..1e1dfd82 100644
--- a/buildroot/package/rpi-firmware/rpi-firmware.mk
+++ b/buildroot/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 18b5b6977d021937d82fb94010c99d84b403a08a
+RPI_FIRMWARE_VERSION = 2b495acb7ed00d629bd865209858c9eccff8f77f
 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/recovery/config.h b/recovery/config.h
index bd493a1e..de0472f1 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.1"
+#define VERSION_NUMBER "2.2"
 
 /* Color of the background */
 // #define BACKGROUND_COLOR  Qt::white