diff --git a/rear-error-output-s390x-RHEL-99362.patch b/rear-error-output-s390x-RHEL-99362.patch
new file mode 100644
index 0000000..c900355
--- /dev/null
+++ b/rear-error-output-s390x-RHEL-99362.patch
@@ -0,0 +1,15 @@
+commit 1e9e7b3c07912b3960d077e05473dfb61d3a0796
+Author: Pavel Cahyna <pcahyna@redhat.com>
+Date:   Wed Aug 13 16:30:46 2025 +0200
+
+    Error out if any unsupported OUTPUT used on s390
+
+diff --git a/usr/share/rear/prep/Linux-s390/034_check_config.sh b/usr/share/rear/prep/Linux-s390/034_check_config.sh
+new file mode 100644
+index 000000000..6c3eab289
+--- /dev/null
++++ b/usr/share/rear/prep/Linux-s390/034_check_config.sh
+@@ -0,0 +1,3 @@
++if [ "$OUTPUT" != "RAMDISK" ] && [ "$OUTPUT" != "IPL" ] ; then
++   Error "Currently, only OUTPUT=RAMDISK and OUTPUT=IPL are supported on s390/s390x"
++fi
diff --git a/rear.spec b/rear.spec
index 00c9191..29e8cd2 100644
--- a/rear.spec
+++ b/rear.spec
@@ -125,6 +125,9 @@ Patch206: rear-nbu-RHEL-17390-RHEL-17393.patch
 # support "export TMPDIR" again, temporarily, with a warning.
 Patch207: rear-support-export-TMPDIR.patch
 
+# error out if any unsupported OUTPUT used on s390
+Patch208: rear-error-output-s390x-RHEL-99362.patch
+
 # rear contains only bash scripts plus documentation so that on first glance it could be "BuildArch: noarch"
 # but actually it is not "noarch" because it only works on those architectures that are explicitly supported.
 # Of course the rear bash scripts can be installed on any architecture just as any binaries can be installed on any architecture.