diff --git a/buildroot/rebuild.sh b/buildroot/rebuild.sh
index e059dbf..2007b66 100755
--- a/buildroot/rebuild.sh
+++ b/buildroot/rebuild.sh
@@ -32,7 +32,7 @@ CONFIGS=()
 while ((${#})); do
     case ${1} in
         all) for CONFIG in *.config; do CONFIGS+=("../${CONFIG}"); done ;;
-        arm64 | arm | mips | mipsel | ppc32 | ppc64 | ppc64le | riscv | x86 | x86_64) CONFIGS+=("../${1}.config") ;;
+        arm64 | arm | mips | mipsel | ppc32 | ppc64 | ppc64le | riscv | s390 | x86 | x86_64) CONFIGS+=("../${1}.config") ;;
         *) die "Unknown parameter '${1}', exiting!" ;;
     esac
     shift
diff --git a/buildroot/s390.config b/buildroot/s390.config
new file mode 100644
index 0000000..15428e1
--- /dev/null
+++ b/buildroot/s390.config
@@ -0,0 +1,11 @@
+BR2_s390x=y
+BR2_OPTIMIZE_3=y
+BR2_KERNEL_HEADERS_4_4=y
+BR2_GCC_VERSION_8_X=y
+BR2_TARGET_GENERIC_ROOT_PASSWD="root"
+BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
+BR2_ROOTFS_OVERLAY="../overlay-poweroff"
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_BASH=y
+BR2_TARGET_ROOTFS_CPIO=y
+# BR2_TARGET_ROOTFS_TAR is not set
diff --git a/images/s390/rootfs.cpio.zst b/images/s390/rootfs.cpio.zst
new file mode 100644
index 0000000..9f2f182
Binary files /dev/null and b/images/s390/rootfs.cpio.zst differ