diff --git a/fetchmail.changes b/fetchmail.changes
index 45bc58a..40ad444 100644
--- a/fetchmail.changes
+++ b/fetchmail.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Dec 18 09:39:19 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
+
+- Don't require systemd
+- Use tmpfiles for all files
+- Use systemd macro for tmpfiles
+- Don't delete home directory if the user stays
+- Use sysusers config to create system user
+
 -------------------------------------------------------------------
 Fri Sep  4 20:22:16 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 
diff --git a/fetchmail.spec b/fetchmail.spec
index 0c57a9b..0cd8114 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -34,6 +34,7 @@ Source5:        %{name}.keyring
 Source6:        %{name}.service
 Source7:        %{name}.tmpfiles
 Source8:        %{name}.exec
+Source9:        %{name}.sysusers
 Patch0:         fetchmail-6.3.8-smtp_errors.patch
 BuildRequires:  automake
 BuildRequires:  krb5-devel
@@ -44,14 +45,13 @@ BuildRequires:  procmail
 BuildRequires:  python3-base
 BuildRequires:  shadow
 BuildRequires:  systemd-rpm-macros
+BuildRequires:  sysuser-shadow
+BuildRequires:  sysuser-tools
 BuildRequires:  xz
 Requires:       logrotate
 Requires(pre):  %fillup_prereq
-Requires(pre):  coreutils
-Requires(pre):  group(daemon)
-Requires(pre):  shadow
 Suggests:       smtp_daemon
-%{?systemd_requires}
+%sysusers_requires
 
 %description
 Fetchmail is a robust and well-documented remote mail retrieval and
@@ -94,6 +94,7 @@ export CFLAGS="%{optflags} -fPIE"
         --with-gssapi \
 	--with-ssl=%{_prefix}
 %make_build LDFLAGS="-pie"
+%sysusers_generate_pre %{SOURCE9} fetchmail
 
 %install
 %make_install
@@ -103,9 +104,11 @@ cp fetchmail.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/fetchmail
 mkdir -p %{buildroot}/sbin
 mkdir -p %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{_tmpfilesdir}
+mkdir -p %{buildroot}%{_sysusersdir}
 sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{SOURCE6}
 install -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}.service
 install -m 0644 %{SOURCE7} %{buildroot}%{_tmpfilesdir}/%{name}.conf
+install -m 0644 %{SOURCE9} %{buildroot}%{_sysusersdir}/%{name}.conf
 mkdir -p %{buildroot}%{_libexecdir}
 install -m 0755 %{SOURCE8} %{buildroot}%{_libexecdir}/%{name}-systemd-exec
 mkdir -p %{buildroot}%{_sbindir}
@@ -121,31 +124,19 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/fetchmail
 rm -r contrib/gai*
 %find_lang %{name}
 
-%pre
-%{_bindir}/getent passwd fetchmail >/dev/null || \
-  %{_sbindir}/useradd -r -g daemon -s /bin/false \
-  -c "mail retrieval daemon" -d %{_localstatedir}/lib/fetchmail fetchmail || :
+%pre -f fetchmail.pre
 %service_add_pre %{name}.service
 
 %post
 %fillup_only
+%tmpfiles_create %{name}.conf
 %service_add_post %{name}.service
-if [ -x %{_bindir}/systemd-tmpfiles ]; then
-	systemd-tmpfiles --create %{name}.conf || :
-fi
-# Ensure that all files are readable by fetchmail with non-root UID.
-touch var/log/fetchmail
-chown fetchmail var/log/fetchmail
-chmod 0600 var/log/fetchmail
 
 %preun
 %service_del_preun %{name}.service
 
 %postun
 %service_del_postun %{name}.service
-if [ $1 = 0 ]; then
-    rm -rf var/lib/fetchmail
-fi
 
 %check
 %make_build check
@@ -154,7 +145,7 @@ fi
 %license COPYING
 %doc FAQ FEATURES NEWS NOTES OLDNEWS README README.NTLM README.SSL README.SSL-SERVER TODO contrib *.html *.txt *.pdf
 %{_bindir}/fetchmail
-%dir %attr(0700, fetchmail, root) %{_localstatedir}/lib/fetchmail
+%dir %attr(0700, fetchmail, fetchmail) %{_localstatedir}/lib/fetchmail
 %ghost %attr(0600, fetchmail, root) %{_localstatedir}/log/fetchmail
 %{_mandir}/man1/fetchmail.1%{?ext_man}
 %ghost %config(noreplace) %attr(0600, fetchmail, root) %{_sysconfdir}/fetchmailrc
@@ -163,6 +154,7 @@ fi
 %{_sbindir}/rc%{name}
 %{_libexecdir}/%{name}-systemd-exec
 %{_tmpfilesdir}/%{name}.conf
+%{_sysusersdir}/%{name}.conf
 %{_fillupdir}/sysconfig.%{name}
 
 %files -n fetchmailconf
diff --git a/fetchmail.sysusers b/fetchmail.sysusers
new file mode 100644
index 0000000..c3cefac
--- /dev/null
+++ b/fetchmail.sysusers
@@ -0,0 +1,3 @@
+# Type Name ID GECOS [HOME]
+u fetchmail - "mail retrieval daemon" /var/lib/fetchmail
+
diff --git a/fetchmail.tmpfiles b/fetchmail.tmpfiles
index 3edf268..6fe8526 100644
--- a/fetchmail.tmpfiles
+++ b/fetchmail.tmpfiles
@@ -1 +1,2 @@
-d /run/fetchmail 700 fetchmail nobody
+d /run/fetchmail 700 fetchmail fetchmail
+f /var/log/fetchmail 600 fetchmail root