diff --git a/fcst/ft_cmd.c b/fcst/ft_cmd.c
index a5f2dec4b..a072fe814 100644
--- a/fcst/ft_cmd.c
+++ b/fcst/ft_cmd.c
@@ -19,7 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <scsi/libfc.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
 #include <scsi/fc_encode.h>
 #else
 #include <scsi/fc/fc_ms.h>
diff --git a/fcst/ft_io.c b/fcst/ft_io.c
index 738fd7a11..b1de814d2 100644
--- a/fcst/ft_io.c
+++ b/fcst/ft_io.c
@@ -24,7 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <scsi/libfc.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
 #include <scsi/fc_encode.h>
 #else
 #include <scsi/fc/fc_ms.h>
diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf
index 9c61324ee..ba66a894a 100644
--- a/nightly/conf/nightly.conf
+++ b/nightly/conf/nightly.conf
@@ -3,19 +3,19 @@
 ABT_DETAILS="x86_64"
 ABT_JOBS=5
 ABT_KERNELS="  \
-5.10.4         \
+5.10.5         \
 5.9.16-nc      \
 5.8.18-nc      \
 5.7.19-nc      \
 5.6.19-nc      \
 5.5.19-nc      \
-5.4.86-nc      \
+5.4.87-nc      \
 5.3.18-nc      \
 5.2.21-nc      \
 5.1.21-nc      \
 5.0.21-nc      \
 4.20.17-nc     \
-4.19.164-nc    \
+4.19.165-nc    \
 4.18.20-nc     \
 4.17.19-nc     \
 4.16.18-nc     \
diff --git a/scst/include/backport.h b/scst/include/backport.h
index 1752c6e2f..b344f4380 100644
--- a/scst/include/backport.h
+++ b/scst/include/backport.h
@@ -1229,7 +1229,8 @@ static inline int pcie_capability_read_dword(struct pci_dev *dev, int pos,
 #endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 0)
-#if !defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 8
+#if defined(RHEL_RELEASE_CODE) &&				\
+	 RHEL_RELEASE_CODE -0 >= RHEL_RELEASE_VERSION(8, 3))
 /*
  * See also commit 09ed79d6d75f ("percpu_ref: introduce PERCPU_REF_ALLOW_REINIT
  * flag") # v5.3.