diff --git a/device/community/linux-nokia-n900/APKBUILD b/device/community/linux-nokia-n900/APKBUILD
index ccc3d3522..69a1a1a6c 100644
--- a/device/community/linux-nokia-n900/APKBUILD
+++ b/device/community/linux-nokia-n900/APKBUILD
@@ -2,7 +2,7 @@
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 
 pkgname=linux-nokia-n900
-pkgver=5.18.1
+pkgver=5.18.16
 pkgrel=0
 pkgdesc="Mainline kernel fork for Nokia N900"
 arch="armv7"
@@ -61,8 +61,8 @@ package() {
 
 sha512sums="
 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5  linux-5.18.tar.xz
-d8f105b34b4a0f933cddc631f8f54ca2e50f055365c864f33c389972df03cb2cdf415eb47a2b2fbc0d43af6679fe21e3bb459d79d02103a2db8782146473910e  linux-5.18.1.patch.xz
-461e48aa7e26cc41de349da303df3751cf6a3d7c8aa0897a946b39ccab2240696e07a5671649d4d5c994051e649138a708011048a44e236d15e8fcb42f2a6179  config-nokia-n900.armv7
+86b9fcaf7d441b5185730be480211c1e819f16077e65b7324e13ffcbb506bc9f92cffbf1b79dc65b1b2fab80ccdb071a78e581f4fbd484283c2765901ba296f6  linux-5.18.16.patch.xz
+9906dae3f34fdece4fec76713065554f200de8819b88d62adee6987c7e77ac86912458e358ba93c4ba8ba13cd55754b7b8412b54dfc94d5893ec447ed46c26de  config-nokia-n900.armv7
 04a39253afd25a7de03dc45ff322161672005406543c44b97d2dc293f202de7de446aee9707a690a290641c55c7bed6e78bbe096ca323dd7d88d3207427c8d31  0001-ARM-dts-n900-increase-charge-current-limit-to-950mA.patch
 3cc2036ba264bd855358361aacb309ad1cf1660cb82a0978523508d1b3fe513676c58f6efc5bb64f7601b77392c19d2c609b6d83541db7e418c1737cff3973e8  0002-power-supply-bq27xxx-expose-battery-data-when-CI.patch
 991237276bee4ff7bca24cf3a26afe3f12a2a604452793ad905a605890f761ac98374b5509cfbcab33c7b7ccf3da5cc286e70afe27b8e201387f403bf5025ae9  0003-wip-Revert-dma-direct-Fix-potential-NULL-pointer-der.patch
diff --git a/device/community/linux-nokia-n900/config-nokia-n900.armv7 b/device/community/linux-nokia-n900/config-nokia-n900.armv7
index 8fd492a60..38761ce01 100644
--- a/device/community/linux-nokia-n900/config-nokia-n900.armv7
+++ b/device/community/linux-nokia-n900/config-nokia-n900.armv7
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.18.1 Kernel Configuration
+# Linux/arm 5.18.16 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 11.2.1_git20220219) 11.2.1 20220219"
 CONFIG_CC_IS_GCC=y
@@ -13,6 +13,7 @@ CONFIG_LD_VERSION=23800
 CONFIG_LLD_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
+CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_PAHOLE_VERSION=0
@@ -144,6 +145,7 @@ CONFIG_GENERIC_SCHED_CLOCK=y
 # end of Scheduler features
 
 CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
+CONFIG_GCC12_NO_ARRAY_BOUNDS=y
 CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 CONFIG_MEMCG=y
@@ -1497,6 +1499,7 @@ CONFIG_CONNECTOR=m
 # CONFIG_FW_CFG_SYSFS is not set
 # CONFIG_TRUSTED_FOUNDATIONS is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
+# CONFIG_EFI_DISABLE_RUNTIME is not set
 CONFIG_HAVE_ARM_SMCCC=y
 
 #
@@ -2966,7 +2969,7 @@ CONFIG_DVB_MAX_ADAPTERS=16
 # Media drivers
 #
 # CONFIG_MEDIA_USB_SUPPORT is not set
-CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_ADAPTERS=m
 # CONFIG_RADIO_SAA7706H is not set
 # CONFIG_RADIO_SHARK is not set
 # CONFIG_RADIO_SHARK2 is not set
@@ -5951,6 +5954,7 @@ CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
 CONFIG_CRYPTO_LIB_SHA256=y
 # end of Crypto library routines
 
+CONFIG_LIB_MEMNEQ=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y