diff --git a/kexec-dont-use-kexec_file_load-on-xen.patch b/kexec-dont-use-kexec_file_load-on-xen.patch
new file mode 100644
index 0000000..5c18f79
--- /dev/null
+++ b/kexec-dont-use-kexec_file_load-on-xen.patch
@@ -0,0 +1,59 @@
+From: Jiri Bohac <jbohac@suse.cz>
+Subject: [PATCH] kexec: dont use kexec_file_load on XEN
+Patch-mainline: 94fbe64fb22d61726ca0c0996987574b6c783c19
+References: bsc#1218590
+
+Since commit 29fe5067ed07 ("kexec: make -a the default")
+kexec tries the kexec_file_load syscall first and only falls back to kexec_load on
+selected error codes.
+
+This effectively breaks kexec on XEN, unless -c is pecified to force the kexec_load
+syscall.
+
+The XEN-specific functions (xen_kexec_load / xen_kexec_unload) are only called
+from my_load / k_unload, i.e. the kexec_load code path.
+
+With -p (panic kernel) kexec_file_load on XEN fails with -EADDRNOTAVAIL (crash
+kernel reservation is ignored by the kernel on XEN), which is not in the list
+of return codes that cause the fallback to kexec_file.
+
+Without -p kexec_file_load actualy leads to a kernel oops on v6.4.0
+(needs to be dubugged separately).
+
+Signed-off-by: Jiri Bohac <jbohac@suse.cz>
+Fixes: 29fe5067ed07 ("kexec: make -a the default")
+---
+ kexec/kexec.8 | 1 +
+ kexec/kexec.c | 4 ++++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/kexec/kexec.8 b/kexec/kexec.8
+index b969cea..9e995fe 100644
+--- a/kexec/kexec.8
++++ b/kexec/kexec.8
+@@ -162,6 +162,7 @@ Specify that the new kernel is of this
+ .TP
+ .BI \-s\ (\-\-kexec-file-syscall)
+ Specify that the new KEXEC_FILE_LOAD syscall should be used exclusively.
++Ignored on XEN.
+ .TP
+ .BI \-c\ (\-\-kexec-syscall)
+ Specify that the old KEXEC_LOAD syscall should be used exclusively.
+diff --git a/kexec/kexec.c b/kexec/kexec.c
+index 08edfca..9d0ec46 100644
+--- a/kexec/kexec.c
++++ b/kexec/kexec.c
+@@ -1685,6 +1685,10 @@ int main(int argc, char *argv[])
+ 			}
+ 		}
+ 	}
++	if (xen_present()) {
++		do_kexec_file_syscall = 0;
++		do_kexec_fallback = 0;
++	}
+ 	if (do_kexec_file_syscall) {
+ 		if (do_load_jump_back_helper && !do_kexec_fallback)
+ 			die("--load-jump-back-helper not supported with kexec_file_load\n");
+-- 
+2.43.0
+
diff --git a/kexec-tools.changes b/kexec-tools.changes
index 0884004..9902248 100644
--- a/kexec-tools.changes
+++ b/kexec-tools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jan 19 16:50:42 UTC 2024 - Jiri Bohac <jbohac@suse.com>
+
+- kexec: don't use kexec_file_load on xen (bsc#1218590)
+
 -------------------------------------------------------------------
 Tue Oct 24 11:11:11 UTC 2023 - olaf@aepfle.de
 
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 09e27c7..3baba23 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package kexec-tools
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -35,6 +35,7 @@ Patch4:         %{name}-vmcoreinfo-in-xen.patch
 # https://patchwork.kernel.org/project/linux-riscv/patch/20190416123233.4779-1-mick@ics.forth.gr/
 Patch5:         %{name}-riscv64.patch
 Patch10:        %{name}-SYS_getrandom.patch
+Patch11:        kexec-dont-use-kexec_file_load-on-xen.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  systemd-rpm-macros