diff --git a/.raspberrypi2.metadata b/.raspberrypi2.metadata
index cc397dc..7ca2f9f 100644
--- a/.raspberrypi2.metadata
+++ b/.raspberrypi2.metadata
@@ -1,3 +1,3 @@
 98ae49ad49397d5a4dcb3ff9a082223edf7c5bbd  SOURCES/linux-5.4.tar.xz
-d115792ed906ca8b0374edca2418a1663b86837c  SOURCES/d2ab264b688a223e23029ffbba86820c8c6cb329.tar.gz
-b4f864dc4c66a4c134b8f3c6f42b50b697f6c133  SOURCES/patch-5.4.155.xz
+21258cd15b5b6090295f9dad236bfb978285cc0c  SOURCES/c8c985aed7b849deefc77236d9fc550ee7bec15d.tar.gz
+cefa9114a1401235edd870c17bb441802bfeeea0  SOURCES/patch-5.4.158.xz
diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec
index dcf5188..0fcfabf 100644
--- a/SPECS/raspberrypi2.spec
+++ b/SPECS/raspberrypi2.spec
@@ -1,4 +1,4 @@
-%global commit_firmware_long d2ab264b688a223e23029ffbba86820c8c6cb329
+%global commit_firmware_long c8c985aed7b849deefc77236d9fc550ee7bec15d
 %global commit_linux_long ec0dcf3064b8ba99f226438214407fcea9870f76
 
 ExclusiveArch: aarch64 armv7hl
@@ -32,7 +32,7 @@ ExclusiveArch: aarch64 armv7hl
 %define extra_version 1
 
 %define kversion 5.4
-%define kfullversion %{kversion}.155
+%define kfullversion %{kversion}.158
 
 Name:           raspberrypi2
 Version:        %{kfullversion}
@@ -285,6 +285,9 @@ cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/overlays/README
 %doc /boot/LICENCE.broadcom
 
 %changelog
+* Sat Nov  6 2021 Pablo Greco <pgreco@centosproject.org> - 5.4.158
+- Update to version v5.4.158
+
 * Sat Oct 23 2021 Pablo Greco <pgreco@centosproject.org> - 5.4.155
 - Update to version v5.4.155