diff --git a/system-group-s390-tools.conf b/system-group-s390-tools.conf
new file mode 100644
index 0000000..623f145
--- /dev/null
+++ b/system-group-s390-tools.conf
@@ -0,0 +1,4 @@
+# Type Name ID GECOS [HOME]
+g cpacfstats -
+g ts-shell   -
+g zkeyadm    -
diff --git a/system-users.changes b/system-users.changes
index 0c69c4f..712c64f 100644
--- a/system-users.changes
+++ b/system-users.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 31 13:33:05 UTC 2019 - Michal Suchanek <msuchanek@suse.de>
+
+- Add cpacfstats, ts-shell, and zkeyadm groups for s390-tools (bsc#1123730)
+
 -------------------------------------------------------------------
 Wed Mar 21 12:12:00 UTC 2018 - fbui@suse.com
 
diff --git a/system-users.spec b/system-users.spec
index fce5dfd..66e54ef 100644
--- a/system-users.spec
+++ b/system-users.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package system-users
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -38,6 +38,7 @@ Source14:       system-user-lp.conf
 Source15:       system-user-nobody.conf
 Source16:       system-user-upsd.conf
 Source17:       system-user-uuidd.conf
+Source18:       system-group-s390-tools.conf
 BuildRequires:  sysuser-shadow
 BuildRequires:  sysuser-tools
 BuildArch:      noarch
@@ -127,6 +128,14 @@ Group:          System/Fhs
 %description -n system-group-wheel
 This package provides the system group 'wheel'.
 
+%package -n system-group-s390-tools
+Summary:        System group 's390-tools'
+Group:          System/Fhs
+%{sysusers_requires}
+
+%description -n system-group-s390-tools
+This package provides the system group 's390-tools' for s390-tools.
+
 %package -n system-user-wwwrun
 Summary:        System user wwwrun and group www
 Group:          System/Fhs
@@ -208,6 +217,7 @@ This package provides the system account and group 'uuidd'.
 %sysusers_generate_pre %{SOURCE15} nobody
 %sysusers_generate_pre %{SOURCE16} upsd
 %sysusers_generate_pre %{SOURCE17} uuidd
+%sysusers_generate_pre %{SOURCE18} s390-tools
 
 %install
 mkdir -p %{buildroot}%{_sysusersdir}
@@ -236,6 +246,7 @@ install -m 644 %{SOURCE14} %{buildroot}%{_sysusersdir}/system-user-lp.conf
 install -m 644 %{SOURCE15} %{buildroot}%{_sysusersdir}/system-user-nobody.conf
 install -m 644 %{SOURCE16} %{buildroot}%{_sysusersdir}/system-user-upsd.conf
 install -m 644 %{SOURCE17} %{buildroot}%{_sysusersdir}/system-user-uuidd.conf
+install -m 644 %{SOURCE18} %{buildroot}%{_sysusersdir}/system-group-s390-tools.conf
 
 %pre -n system-user-uucp -f uucp.pre
 %pre -n system-user-games -f games.pre
@@ -246,6 +257,7 @@ install -m 644 %{SOURCE17} %{buildroot}%{_sysusersdir}/system-user-uuidd.conf
 %pre -n system-group-obsolete -f obsolete.pre
 %pre -n system-group-hardware -f hardware.pre
 %pre -n system-group-wheel -f wheel.pre
+%pre -n system-group-s390-tools -f s390-tools.pre
 %pre -n system-user-wwwrun -f wwwrun.pre
 %pre -n system-user-mail -f mail.pre
 %pre -n system-user-ftp -f ftp.pre
@@ -296,6 +308,10 @@ install -m 644 %{SOURCE17} %{buildroot}%{_sysusersdir}/system-user-uuidd.conf
 %defattr(-,root,root)
 %{_sysusersdir}/system-group-wheel.conf
 
+%files -n system-group-s390-tools
+%defattr(-,root,root)
+%{_sysusersdir}/system-group-s390-tools.conf
+
 %files -n system-user-wwwrun
 %defattr(-,root,root)
 %dir %attr(0755,wwwrun,root) %{_localstatedir}/lib/wwwrun