diff --git a/usr/share/rear/output/IPL/Linux-s390/800_create_ipl.sh b/usr/share/rear/output/IPL/Linux-s390/800_create_ipl.sh
deleted file mode 100644
index 54a724da1d..0000000000
--- a/usr/share/rear/output/IPL/Linux-s390/800_create_ipl.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# Create the 'initial program' to boot/load the ReaR recovery system
-# on IBM Z via IPL (initial program load)
-LogPrint "Creating initial program for IPL on IBM Z"
-RESULT_FILES+=( $KERNEL_FILE $TMP_DIR/$REAR_INITRD_FILENAME )
-
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 0000000000..0f3296812e
--- /dev/null
+++ b/usr/share/rear/prep/Linux-s390/034_check_config.sh
@@ -0,0 +1,8 @@
+if [ "$OUTPUT" = "IPL" ]; then
+    LogPrintError "Warning: OUTPUT=IPL is deprecated. Use OUTPUT=RAMDISK instead."
+    OUTPUT=RAMDISK
+fi
+
+if [ "$OUTPUT" != "RAMDISK" ] ; then
+   Error "Currently, only OUTPUT=RAMDISK is supported on s390/s390x"
+fi