diff --git a/debian/rom-strip b/debian/rom-strip
new file mode 100755
index 0000000000000000000000000000000000000000..21d0bc0f7081c91dbd36f9d9a0eefbddb468d1af
--- /dev/null
+++ b/debian/rom-strip
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -uxe
+CROSSPFX=${1}
+IMAGE=${2}
+DEBUGPATH="b/s390fw/usr/lib/debug/.build-id"
+
+BUILDID1=$(readelf -n ${IMAGE} | grep '^\s*Build ID:' | cut -c 15-16)
+BUILDID2=$(readelf -n ${IMAGE} | grep '^\s*Build ID:' | cut -c 17-)
+
+mkdir -p "${DEBUGPATH}/${BUILDID1}"
+
+${CROSSPFX}objcopy --only-keep-debug --compress-debug-sections \
+    "${IMAGE}" "${DEBUGPATH}/${BUILDID1}/${BUILDID2}.debug"
+
+${CROSSPFX}strip --remove-section=.comment --remove-section=.note \
+    --strip-unneeded "${IMAGE}"
diff --git a/debian/rules b/debian/rules
index 9d9f18f7405210dc96b15886743b111ba6d3cd04..7031395acf8e4935a9f933627fe0f5540a4e0fdc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,8 @@ enable_linux_user = $(if $(filter qemu-user,${BUILD_PACKAGES}),enable,disable)
 FIRMWAREPATH = /usr/share/qemu:/usr/share/seabios:/usr/lib/ipxe/qemu
 PKGVERSION = Debian ${DEB_VERSION}
 SAVEMODDIR = /run/qemu/$(shell echo -n "${PKGVERSION}" | tr --complement '[:alnum:]+-.~' '_')
-sysdatadir = debian/qemu-system-data/usr/share/qemu
+sysdatabase = debian/qemu-system-data
+sysdatadir = ${sysdatabase}/usr/share/qemu
 
 ALPHAEV67_CROSSPFX = alpha-linux-gnu-
 PPC64_CROSSPFX = powerpc64-linux-gnu-
@@ -488,6 +489,7 @@ b/s390fw/built:
 	touch $@
 install-s390x-fw: build-s390x-fw
 	install -m 0644 -t "${sysdatadir}" b/s390fw/s390*.img
+	cp -av b/s390fw/usr debian/qemu-system-data
 sysdata-components += s390x-fw
 
 ### hppa-firmware (roms/seabios-hppa)
diff --git a/debian/s390fw.mak b/debian/s390fw.mak
index 64fab0f2c02c0a30bb4c7cfb7fb369a45d609897..7061db7e56c89aebd6e76a848ab6cb3ae59625cf 100644
--- a/debian/s390fw.mak
+++ b/debian/s390fw.mak
@@ -20,7 +20,7 @@ CCW_FSRCS = $(addprefix pc-bios/s390-ccw/,${CCW_SRCS})
 
 ${OUT}s390-ccw.img: $(CCW_FSRCS)
 	${S390X_CROSSPFX}gcc -o $@ ${LDFLAGS} $^
-	${S390X_CROSSPFX}strip --strip-unneeded $@
+	./debian/rom-strip $(S390X_CROSSPFX) $@
 	chmod -x $@
 
 NETBOOT_SRCS = start.S sclp.c cio.c virtio.c virtio-net.c jump2ipl.c netmain.c
@@ -45,5 +45,5 @@ ${OUT}s390-netboot.img: ${NETBOOT_FSRCS} ${SLOF_LIBSRCS}
 	${S390X_CROSSPFX}gcc -o $@ ${LDFLAGS} -Ttext=0x7800000 \
 	  -nostdinc -I${SLOFLIB}include -I${SLOF}/lib/libnet -DDHCPARCH=0x1F \
 	  $^
-	${S390X_CROSSPFX}strip --strip-unneeded $@
+	./debian/rom-strip $(S390X_CROSSPFX) $@
 	chmod -x $@