diff --git a/scripts/specialize-patch b/scripts/specialize-patch
index 434d3a099..7140aea85 100755
--- a/scripts/specialize-patch
+++ b/scripts/specialize-patch
@@ -72,8 +72,7 @@ function evaluate(stmnt, pattern, arg, op, result) {
        "(LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0))", stmnt)
 
   gsub("defined\\(USE_PRE_440_WR_STRUCTURE\\)",
-       "(LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) || " \
-       "RHEL_RELEASE_CODE -0 >= 7 * 256 + 6)", stmnt)
+       "(LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0))", stmnt)
 
   gsub("defined\\(IB_CREATE_CQ_HAS_INIT_ATTR\\)",
        "(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) || " \
@@ -84,8 +83,7 @@ function evaluate(stmnt, pattern, arg, op, result) {
        "RHEL_RELEASE_CODE -0 >= 7 * 256 + 6)", stmnt)
 
   gsub("defined\\(IB_CM_LISTEN_TAKES_FOURTH_ARG\\)",
-       "(LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) || " \
-       "RHEL_RELEASE_CODE -0 >= 7 * 256 + 6)", stmnt)
+       "(LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0))", stmnt)
 
   gsub("defined\\(IB_CLIENT_REMOVE_TAKES_TWO_ARGS\\)",
        "(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) || " \
@@ -103,7 +101,12 @@ function evaluate(stmnt, pattern, arg, op, result) {
        "(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0))", stmnt)
 
   gsub("HAVE_DEV_ATTR_MAX_SEND_SGE",
-       "(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0))", stmnt)
+       "(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || " \
+       "RHEL_RELEASE_CODE -0 >= 8 * 256 + 0)", stmnt)
+
+  gsub("defined\\(HAVE_DEV_ATTR_MAX_RECV_SGE\\)",
+       "(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || " \
+       "RHEL_RELEASE_CODE -0 >= 8 * 256 + 0)", stmnt)
 
   gsub("HAVE_RDMA_DESTROY_AH_WITH_FLAGS",
        "(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 21, 0))", stmnt)
@@ -125,8 +128,7 @@ function evaluate(stmnt, pattern, arg, op, result) {
        "RHEL_RELEASE_CODE -0 >= 6 * 256 + 10)", stmnt)
 
   gsub("defined\\(HAVE_IB_QUERY_DEVICE\\)",
-       "(LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) || " \
-       "RHEL_RELEASE_CODE -0 >= 7 * 256 + 6)", stmnt)
+       "(LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0))", stmnt)
 
   gsub("defined\\(MAD_HANDLER_TAKES_SEND_BUF\\)",
        "(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) || " \