diff -pruN 0.6/debian/changelog 0.6ubuntu2/debian/changelog
--- 0.6/debian/changelog	2014-03-14 22:16:26.000000000 +0000
+++ 0.6ubuntu2/debian/changelog	2018-03-26 16:44:49.000000000 +0000
@@ -1,3 +1,17 @@
+s390-sysconfig-writer (0.6ubuntu2) bionic; urgency=medium
+
+  * Strip =n/a values from chzdev active configuration, before storing
+    persistent one, as chzdev does not accept it. LP: #1757369
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 26 Mar 2018 17:44:49 +0100
+
+s390-sysconfig-writer (0.6ubuntu1) xenial; urgency=medium
+
+  * Migrate sysconfig-writer to chzdev tooling, and thus generate and
+    store minimalistic udev rules in the target. LP: #1560545.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 08 Apr 2016 14:16:56 +0100
+
 s390-sysconfig-writer (0.6) unstable; urgency=low
 
   [ Dmitrijs Ledkovs ]
diff -pruN 0.6/debian/control 0.6ubuntu2/debian/control
--- 0.6/debian/control	2013-12-03 23:54:18.000000000 +0000
+++ 0.6ubuntu2/debian/control	2016-04-08 15:39:38.000000000 +0000
@@ -1,7 +1,8 @@
 Source: s390-sysconfig-writer
 Section: debian-installer
 Priority: standard
-Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 Uploaders: Bastian Blank <waldi@debian.org>
 Build-Depends: debhelper (>= 9)
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/s390-sysconfig-writer.git
@@ -10,5 +11,6 @@ Vcs-Git: git://anonscm.debian.org/d-i/s3
 Package: s390-sysconfig-writer
 Package-Type: udeb
 Architecture: s390 s390x
+Depends: s390-tools-udeb (>= 1.34.0-0ubuntu4)
 Description: Sysconfig writer
  Write sysconfig config files.
diff -pruN 0.6/debian/s390-sysconfig-writer.post-base-installer 0.6ubuntu2/debian/s390-sysconfig-writer.post-base-installer
--- 0.6/debian/s390-sysconfig-writer.post-base-installer	2013-12-03 23:54:18.000000000 +0000
+++ 0.6ubuntu2/debian/s390-sysconfig-writer.post-base-installer	2018-03-26 16:40:02.000000000 +0000
@@ -1,6 +1,13 @@
 #!/bin/sh
 
-mkdir -p /target/etc/sysconfig/hardware
-cp -a /etc/sysconfig/hardware/* /target/etc/sysconfig/hardware
+set -e
 
-apt-install sysconfig-hardware || true
+mkdir -p /target/etc/udev/rules.d
+
+chzdev --quiet --active --online --export /etc/chzdev.config
+
+sed -i 's/^\[active/\[persistent/' /etc/chzdev.config
+
+sed -i '/=n\/a/d' /etc/chzdev.config
+
+chzdev --quiet --persistent --no-root-update --import /etc/chzdev.config --base /etc=/target/etc 1>/dev/null