diff --git a/device/main/linux-purism-librem5/0004-input-keyboard-snvs_pwrkey-Fix-SNVS_HPVIDR1-register.patch b/device/main/linux-purism-librem5/0004-input-keyboard-snvs_pwrkey-Fix-SNVS_HPVIDR1-register.patch
new file mode 100644
index 000000000..2c3b209c5
--- /dev/null
+++ b/device/main/linux-purism-librem5/0004-input-keyboard-snvs_pwrkey-Fix-SNVS_HPVIDR1-register.patch
@@ -0,0 +1,30 @@
+From e2ae58c182d58a52ef77f2e9a5739e5afa5e10c4 Mon Sep 17 00:00:00 2001
+From: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
+Date: Mon, 28 Feb 2022 06:01:10 +0100
+Subject: [PATCH] input: keyboard: snvs_pwrkey: Fix SNVS_HPVIDR1 register
+ address
+
+Both i.MX6 and i.MX8 reference manuals list 0xBF8 as SNVS_HPVIDR1.
+
+Fixes: 1a26c920717a ("Input: snvs_pwrkey - send key events for i.MX6 S, DL and Q")
+Signed-off-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
+---
+ drivers/input/keyboard/snvs_pwrkey.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/input/keyboard/snvs_pwrkey.c b/drivers/input/keyboard/snvs_pwrkey.c
+index 65286762b02a..ad8660be0127 100644
+--- a/drivers/input/keyboard/snvs_pwrkey.c
++++ b/drivers/input/keyboard/snvs_pwrkey.c
+@@ -20,7 +20,7 @@
+ #include <linux/mfd/syscon.h>
+ #include <linux/regmap.h>
+ 
+-#define SNVS_HPVIDR1_REG	0xF8
++#define SNVS_HPVIDR1_REG	0xBF8
+ #define SNVS_LPSR_REG		0x4C	/* LP Status Register */
+ #define SNVS_LPCR_REG		0x38	/* LP Control Register */
+ #define SNVS_HPSR_REG		0x14
+-- 
+2.35.1
+
diff --git a/device/main/linux-purism-librem5/APKBUILD b/device/main/linux-purism-librem5/APKBUILD
index 6f6d370cf..9de551ec3 100644
--- a/device/main/linux-purism-librem5/APKBUILD
+++ b/device/main/linux-purism-librem5/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:  Clayton Craft <clayton@craftyguy.net>
 # Co-Maintainer: Bhushan Shah <bshah@kde.org>
 pkgname=linux-purism-librem5
-pkgver=5.16.7
+pkgver=5.16.11
 pkgrel=0
 _purismrel=1
 # <kernel ver>.<purism kernel release>
@@ -32,14 +32,15 @@ subpackages="$pkgname-dev"
 install="$pkgname.post-upgrade"
 
 # Source
-_repository="linux-next"
+_repository="linux"
 # kconfig generated with: ARCH=arm64 make defconfig KBUILD_DEFCONFIG=librem5_defconfig
 _config="config-$_flavor.$arch"
 source="
-	$pkgname-$_purismver.tar.gz::https://source.puri.sm/Librem5/$_repository/-/archive/pureos/$_purismver/$_repository-pureos-$_purismver.tar.gz
+	$pkgname-$_purismver.tar.gz::https://source.puri.sm/Librem5/linux/-/archive/pureos/$_purismver/linux-pureos-$_purismver.tar.gz
 	0001-bq25890_charger-enter-ship-mode-on-power-off.patch
 	0002-arm64-dts-imx8mq-librem5.dtsi-adjust-the-usdhc-bus-s.patch
 	0003-imx8mq-librem5-r3-Set-the-CPU-voltage-to-1.0V-when-r.patch
+	0004-input-keyboard-snvs_pwrkey-Fix-SNVS_HPVIDR1-register.patch
 	$_config
 "
 builddir="$srcdir/$_repository-pureos-$_purismver"
@@ -79,9 +80,10 @@ dev() {
 		INSTALL_HDR_PATH="$subpkgdir"/usr
 }
 sha512sums="
-5bcde0d5c8210f356eea9124674838543be0659d0408366d2345cb837bb3761508c3b587a8fc6f7b8e8f9bf6a353b3d186fba5917c812b0e4a72dd093063d877  linux-purism-librem5-5.16.7pureos1.tar.gz
+4f1d8d9cfc151780a2a9bfbc86899aa049a6353fab202cb28f38a720267a88b40ef9a637899fc4f4f26624dd3983e4a5728f50f9915072353be96f04766313a2  linux-purism-librem5-5.16.11pureos1.tar.gz
 0e3caf6275247e31b874b94330dc4f991837a4b62f3c15a1f8ad39a7edd02ae499679bcd7ddc9463bb1c1a5073ea5980fa144a2ece804d72a6b2fc8c76c50766  0001-bq25890_charger-enter-ship-mode-on-power-off.patch
 1dbf2adaf097bcce3ee179cd6b0f10d2ebefdc82191d34fffea8cb336c9dcbc66b717bf97a2e264b8068f178c0254f2b1281a09ae72d4825fd7b4a39916c0461  0002-arm64-dts-imx8mq-librem5.dtsi-adjust-the-usdhc-bus-s.patch
 c52f9e7e17f876697000a0c3b959a0d571ca506ba55ee5158e30ac00e148372097c88951a354190f669137a955405c87042a925c1bbe3cd91df40721650d45d3  0003-imx8mq-librem5-r3-Set-the-CPU-voltage-to-1.0V-when-r.patch
+f48c80d81e748499411dbc255229b6957082d251f43c8b4b1996ca56ed141ba968ef17ee731260a5cb3f9e7467ae0b73b40fbf09d8ac462e1db10f4e9f5e1b53  0004-input-keyboard-snvs_pwrkey-Fix-SNVS_HPVIDR1-register.patch
 9f561f74d826bf1cd166f87a22936c744ef9148f3508359d423df75efdf60ec24f18b0938ae3bb16b5aa5eaba4826fcde38b2ad2feae2027378f19e94ff60394  config-purism-librem5.aarch64
 "