diff --git a/fcst/ft_cmd.c b/fcst/ft_cmd.c
index a072fe814..d2dc37e8c 100644
--- a/fcst/ft_cmd.c
+++ b/fcst/ft_cmd.c
@@ -19,7 +19,9 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <scsi/libfc.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0) &&		\
+	!(LINUX_VERSION_CODE == KERNEL_VERSION(5, 4, 7) &&	\
+	  defined(UEK_KABI_RENAME))
 #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 b1de814d2..c17a6df2d 100644
--- a/fcst/ft_io.c
+++ b/fcst/ft_io.c
@@ -24,7 +24,9 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <scsi/libfc.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0) &&		\
+	!(LINUX_VERSION_CODE == KERNEL_VERSION(5, 4, 7) &&	\
+	  defined(UEK_KABI_RENAME))
 #include <scsi/fc_encode.h>
 #else
 #include <scsi/fc/fc_ms.h>