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-user-tftp.conf b/system-user-tftp.conf
new file mode 100644
index 0000000..d45b7eb
--- /dev/null
+++ b/system-user-tftp.conf
@@ -0,0 +1,3 @@
+# Type Name ID GECOS [HOME]
+g tftp -
+u tftp - "TFTP Account" /srv/tftpboot
diff --git a/system-users.changes b/system-users.changes
index 712c64f..00d9986 100644
--- a/system-users.changes
+++ b/system-users.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+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>
+
+- Add system-user-tftp subpackage with tftp user and group and
+  /srv/tftpboot as home directory [bsc#1143454].
+
 -------------------------------------------------------------------
 Thu Jan 31 13:33:05 UTC 2019 - Michal Suchanek <msuchanek@suse.de>
 
diff --git a/system-users.spec b/system-users.spec
index 66e54ef..68dc856 100644
--- a/system-users.spec
+++ b/system-users.spec
@@ -38,7 +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
+Source19:       system-user-tftp.conf
 BuildRequires:  sysuser-shadow
 BuildRequires:  sysuser-tools
 BuildArch:      noarch
@@ -128,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
@@ -197,6 +189,14 @@ Group:          System/Fhs
 %description -n system-user-uuidd
 This package provides the system account and group 'uuidd'.
 
+%package -n system-user-tftp
+Summary:        System user and group tftp
+Group:          System/Fhs
+%{sysusers_requires}
+
+%description -n system-user-tftp
+This package provides the system account and group 'tftp'.
+
 %prep
 %setup -q -c -T
 
@@ -217,7 +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
+%sysusers_generate_pre %{SOURCE19} tftp
 
 %install
 mkdir -p %{buildroot}%{_sysusersdir}
@@ -230,6 +230,7 @@ mkdir -p %{buildroot}%{_localstatedir}/spool/lpd
 mkdir -p %{buildroot}%{_localstatedir}/run/uuidd
 mkdir -p %{buildroot}/srv/ftp
 mkdir -p %{buildroot}%{_localstatedir}/lib/nobody
+mkdir -p %{buildroot}/srv/tftpboot
 install -m 644 %{SOURCE1} %{buildroot}%{_sysusersdir}/system-user-uucp.conf
 install -m 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/system-user-games.conf
 install -m 644 %{SOURCE3} %{buildroot}%{_sysusersdir}/system-user-bin.conf
@@ -246,7 +247,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
+install -m 644 %{SOURCE19} %{buildroot}%{_sysusersdir}/system-user-tftp.conf
 
 %pre -n system-user-uucp -f uucp.pre
 %pre -n system-user-games -f games.pre
@@ -257,7 +258,6 @@ install -m 644 %{SOURCE18} %{buildroot}%{_sysusersdir}/system-group-s390-tools.c
 %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
@@ -268,6 +268,7 @@ install -m 644 %{SOURCE18} %{buildroot}%{_sysusersdir}/system-group-s390-tools.c
 
 %pre -n system-user-upsd -f upsd.pre
 %pre -n system-user-uuidd -f uuidd.pre
+%pre -n system-user-tftp -f tftp.pre
 
 %files -n system-user-uucp
 %defattr(-,root,root)
@@ -308,10 +309,6 @@ install -m 644 %{SOURCE18} %{buildroot}%{_sysusersdir}/system-group-s390-tools.c
 %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
@@ -345,4 +342,9 @@ install -m 644 %{SOURCE18} %{buildroot}%{_sysusersdir}/system-group-s390-tools.c
 %defattr(-,root,root)
 %{_sysusersdir}/system-user-uuidd.conf
 
+%files -n system-user-tftp
+%defattr(-,root,root)
+%dir %attr(0755,tftp,tftp) /srv/tftpboot
+%{_sysusersdir}/system-user-tftp.conf
+
 %changelog