diff --git a/scripts/specialize-patch b/scripts/specialize-patch
index 5cf79b948..bf74efab5 100755
--- a/scripts/specialize-patch
+++ b/scripts/specialize-patch
@@ -108,6 +108,10 @@ function evaluate(stmnt, pattern, arg, op, result) {
   gsub("defined\\(HAVE_IB_DMA_MAP_OPS\\)",
        "(LINUX_VERSION_CODE >= KERNEL_VERSION(0, 0, 0))", stmnt)
 
+  gsub("defined(ENABLE_NPIV)", 0, stmnt)
+
+  gsub("defined(FC_VPORT_CREATE_DEFINED)", 0, stmnt)
+
   gsub("LINUX_VERSION_CODE", LINUX_VERSION_CODE, stmnt)
 
   pattern="KERNEL_VERSION\\([[:blank:]]*([0-9]+)[[:blank:]]*,[[:blank:]]*([0-9]+)[[:blank:]]*,[[:blank:]]*([0-9]+)[[:blank:]]*\\)"
@@ -337,6 +341,8 @@ function handle_if(evaluated)
   if ($0 ~ "LINUX_VERSION_CODE"    \
       || $0 ~ "CONFIG_SCST_PROC"   \
       || $0 ~ "CREATE_SEND_MAD_HAS_BASE_ARG"   \
+      || $0 ~ "ENABLE_NPIV" \
+      || $0 ~ "FC_VPORT_CREATE_DEFINED" \
       || $0 ~ "HAVE_IB_DMA_MAP_OPS" \
       || $0 ~ "HAVE_IB_QUERY_DEVICE" \
       || $0 ~ "HAVE_IB_SET_CPI_RESP_TIME" \