diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build
index bc112fc98..853fc4a19 100755
--- a/kpatch-build/kpatch-build
+++ b/kpatch-build/kpatch-build
@@ -275,6 +275,14 @@ support_klp_replace()
 	fi
 }
 
+check_paravirt() {
+	if kernel_is_rhel; then
+		! rhel_kernel_version_gte 5.14.0-582.el9
+	else
+		! kernel_version_gte 6.8.0
+	fi
+}
+
 find_dirs() {
 	if [[ -e "$SCRIPTDIR/create-diff-object" ]]; then
 		# git repo
@@ -385,7 +393,7 @@ find_special_section_data() {
 		"x86_64")
 			check[a]=true					# alt_instr
 			kernel_version_gte 5.10.0 && check[s]=true	# static_call_site
-			[[ -n "$CONFIG_PARAVIRT" ]] && ! kernel_version_gte 6.8.0 && check[p]=true	# paravirt_patch_site
+			[[ -n "$CONFIG_PARAVIRT" ]] && check_paravirt && check[p]=true	# paravirt_patch_site
 			;;
 		"ppc64le")
 			check[f]=true					# fixup_entry