diff --git a/kernel.spec b/kernel.spec
index 10d6ce0..2967f17 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -31,7 +31,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1.
 %global released_kernel 0
 
-%global distro_build 39
+%global distro_build 40
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -70,13 +70,13 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.9.0
-%define pkgrelease 39
+%define pkgrelease 40
 
 # This is needed to do merge window version magic
 %define patchlevel 9
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 39%{?buildid}%{?dist}
+%define specrelease 40%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -1216,6 +1216,10 @@ mv linux-5.9 linux-%{KVERREL}
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
 xzcat %{SOURCE5000} | patch -p1 -F1 -s
+# The stable update application above changes the SUBLEVEL, however our rpm
+# versioning doesn't do it: revert the SUBLEVEL change to avoid modules not
+# loading due wrong version (BZ#1898144)
+sed -i 's/^SUBLEVEL = [0-9]\+/SUBLEVEL = 0/' Makefile
 
 %if !%{nopatches}
 
@@ -2647,6 +2651,12 @@ fi
 #
 #
 %changelog
+* Mon Nov 16 2020 Herton R. Krzesinski <herton@redhat.com> [5.9.0-40]
+- Fix boot issue/failure to load modules due mismatch between kernel SUBLEVEL
+  number and directory we install modules due the rpm version, after applying
+  the upstream stable update patch in previous release ("Herton R. Krzesinski")
+  [1898144]
+
 * Fri Nov 13 2020 Herton R. Krzesinski <herton@redhat.com> [5.9.0-39]
 - Apply patches from 5.9.8 upstream stable update ("Herton R. Krzesinski")
 - Drop commit f2ac57a4c49d - "x86/unwind/orc:...", applied now through
diff --git a/sources b/sources
index 0a318ec..f5b5327 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (linux-5.9.tar.xz) = cafd463ca0c9b256479b7dd774f908cedef6d265c44f99de075558ab923808ddfacda1377ae000ce02730c6611527bddffbfc4421bbc4f44fd8e59d97cbc4363
-SHA512 (kernel-kabi-dw-5.9.0-39.tar.bz2) = 3cd53709d27d6d75b4e45b44933d39fbf7eafb1933c750cbaf48dfb3424f7e4ffeadcf136800f388040549bbe8e4b5a47608381ec85247c1474f1958859594d9
-SHA512 (kernel-abi-whitelists-5.9.0-39.tar.bz2) = 03a9111423353a35e3cbe4473e1317f5dcc9b0834b9413b49ebe878f0cc94a42d6b78688132790ae6ba081cc50d6725f1a49b313b8f899943d30d7d095c64f40
 SHA512 (patch-5.9.8.xz) = 53dee96e9d3cf4f720c03687c8a4bea53423f76d16fa685a18e188c0a418d1d5ce3eb308c061138d8c0fd6af0062db0a622429f71d5698ac9092acf13a982f10
+SHA512 (kernel-kabi-dw-5.9.0-40.tar.bz2) = 3cd53709d27d6d75b4e45b44933d39fbf7eafb1933c750cbaf48dfb3424f7e4ffeadcf136800f388040549bbe8e4b5a47608381ec85247c1474f1958859594d9
+SHA512 (kernel-abi-whitelists-5.9.0-40.tar.bz2) = 03a9111423353a35e3cbe4473e1317f5dcc9b0834b9413b49ebe878f0cc94a42d6b78688132790ae6ba081cc50d6725f1a49b313b8f899943d30d7d095c64f40