diff --git a/os-autoinst-4.6.1631697994.f5fcf5e7.obscpio b/os-autoinst-4.6.1631697994.f5fcf5e7.obscpio
deleted file mode 100644
index a4cee75..0000000
--- a/os-autoinst-4.6.1631697994.f5fcf5e7.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3a045352502d402e4c13e7beb327c5b16e8204658ed32c6b2d28b47d771953bf
-size 25307661
diff --git a/os-autoinst-4.6.1631879042.64c44cb2.obscpio b/os-autoinst-4.6.1631879042.64c44cb2.obscpio
new file mode 100644
index 0000000..9f2b72c
--- /dev/null
+++ b/os-autoinst-4.6.1631879042.64c44cb2.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:81f59784ac414121760b29afde93b7069eaf15e353d22fd05bfa25e605a6f46e
+size 25308173
diff --git a/os-autoinst-test.spec b/os-autoinst-test.spec
index 940859a..f2f566a 100644
--- a/os-autoinst-test.spec
+++ b/os-autoinst-test.spec
@@ -19,7 +19,7 @@
 %define name_ext -test
 %define         short_name os-autoinst
 Name:           %{short_name}%{?name_ext}
-Version:        4.6.1631697994.f5fcf5e7
+Version:        4.6.1631879042.64c44cb2
 Release:        0
 Summary:        test package for os-autoinst
 License:        GPL-2.0-or-later
diff --git a/os-autoinst.changes b/os-autoinst.changes
index 525a33f..1bdbebb 100644
--- a/os-autoinst.changes
+++ b/os-autoinst.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Sep 19 08:37:03 UTC 2021 - okurz@suse.com
+
+- Update to version 4.6.1631879042.64c44cb2:
+  * Add aarch64 qemu binary
+  * Add missing files section to spec for s390-deps subpkg
+  * Install fonts-config needed by x3270 and require everything
+
 -------------------------------------------------------------------
 Fri Sep 17 00:38:33 UTC 2021 - okurz@suse.com
 
diff --git a/os-autoinst.obsinfo b/os-autoinst.obsinfo
index 0534357..7189a86 100644
--- a/os-autoinst.obsinfo
+++ b/os-autoinst.obsinfo
@@ -1,5 +1,5 @@
 name: os-autoinst
-version: 4.6.1631697994.f5fcf5e7
-mtime: 1631697994
-commit: f5fcf5e7b3fb183d3ab07c228c02542be5df6aa2
+version: 4.6.1631879042.64c44cb2
+mtime: 1631879042
+commit: 64c44cb26101e4c1d51143d9e43730680cc0a3d9
 
diff --git a/os-autoinst.spec b/os-autoinst.spec
index 78a643c..52934e2 100644
--- a/os-autoinst.spec
+++ b/os-autoinst.spec
@@ -17,7 +17,7 @@
 
 
 Name:           os-autoinst
-Version:        4.6.1631697994.f5fcf5e7
+Version:        4.6.1631879042.64c44cb2
 Release:        0
 Summary:        OS-level test automation
 License:        GPL-2.0-or-later
@@ -81,19 +81,13 @@ Source0:        %{name}-%{version}.tar.xz
 %define test_requires %build_requires %spellcheck_requires %test_base_requires %yamllint_requires perl(Inline::Python) perl(YAML::PP)
 # The following line is generated from dependencies.yaml
 %define devel_requires %python_style_requires %test_requires ShellCheck perl(Devel::Cover) perl(Devel::Cover::Report::Codecov) perl(Perl::Tidy)
+%define s390_zvm_requires /usr/bin/xkbcomp /usr/bin/Xvnc x3270 icewm xterm xterm-console xdotool fonts-config mkfontdir mkfontscale
 BuildRequires:  %test_requires %test_version_only_requires
 Requires:       %main_requires
-Recommends:     /usr/bin/Xvnc
 Recommends:     /usr/bin/qemu-img
-Recommends:     /usr/bin/xkbcomp
-Recommends:     dumponlyconsole
-Recommends:     icewm
+Recommends:     dumponlyconsole %s390_zvm_requires
 Recommends:     qemu >= 2.0.0
 Recommends:     tesseract-ocr
-Recommends:     x3270
-Recommends:     xdotool
-Recommends:     xterm
-Recommends:     xterm-console
 # Optional dependency for Python test API support
 Recommends:     perl(Inline::Python)
 Requires(pre):  %{_bindir}/getent
@@ -148,6 +142,15 @@ Requires:       qemu-x86
 Convenience package providing os-autoinst and qemu-x86 dependencies.
 %endif
 
+%package s390-deps
+Summary:        Convenience package providing os-autoinst + s390 worker jumphost deps
+Group:          Development/Tools/Other
+Requires:       %s390_zvm_requires
+Requires:       os-autoinst
+
+%description s390-deps
+Convenience package providing os-autoinst + s390 worker jumphost dependencies.
+
 %prep
 %setup -q
 sed -e 's,/bin/env python,/bin/python3,' -i crop.py
@@ -245,4 +248,6 @@ cd %{__builddir}
 %files qemu-x86
 %endif
 
+%files s390-deps
+
 %changelog