diff --git a/system-group-s390-tools.conf b/system-group-s390-tools.conf
deleted file mode 100644
index 623f145..0000000
--- a/system-group-s390-tools.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Type Name ID GECOS [HOME]
-g cpacfstats -
-g ts-shell   -
-g zkeyadm    -
diff --git a/system-users.changes b/system-users.changes
index 55ff206..00d9986 100644
--- a/system-users.changes
+++ b/system-users.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug 13 07:07:19 UTC 2019 - Michal Suchanek <msuchanek@suse.com>
+
+- Remove s390 groups again. The s390-tools maintainer wants to add groups in
+  s390-tools manually.
+
 -------------------------------------------------------------------
 Wed Jul 31 09:55:15 UTC 2019 - Reinhard Max <max@suse.com>
 
diff --git a/system-users.spec b/system-users.spec
index 32f4b64..68dc856 100644
--- a/system-users.spec
+++ b/system-users.spec
@@ -38,7 +38,6 @@ 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
 Source19:       system-user-tftp.conf
 BuildRequires:  sysuser-shadow
 BuildRequires:  sysuser-tools
@@ -129,14 +128,6 @@ 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
@@ -226,7 +217,6 @@ This package provides the system account and group 'tftp'.
 %sysusers_generate_pre %{SOURCE15} nobody
 %sysusers_generate_pre %{SOURCE16} upsd
 %sysusers_generate_pre %{SOURCE17} uuidd
-%sysusers_generate_pre %{SOURCE18} s390-tools
 %sysusers_generate_pre %{SOURCE19} tftp
 
 %install
@@ -257,7 +247,6 @@ 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
 install -m 644 %{SOURCE19} %{buildroot}%{_sysusersdir}/system-user-tftp.conf
 
 %pre -n system-user-uucp -f uucp.pre
@@ -269,7 +258,6 @@ install -m 644 %{SOURCE19} %{buildroot}%{_sysusersdir}/system-user-tftp.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
@@ -321,10 +309,6 @@ install -m 644 %{SOURCE19} %{buildroot}%{_sysusersdir}/system-user-tftp.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