diff --git a/fetchmail-initscript b/fetchmail-initscript
deleted file mode 100644
index 8b1edcd..0000000
--- a/fetchmail-initscript
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/bash
-#
-# fetchmail  Start/Stop the fetchmail service
-# Copyright (c) 2007 by Silvan Calarco <silvan.calarco@mambasoft.it>
-#
-# chkconfig: 2345 90 60
-# description: fetchmail is a command line pop3/imap client daemon
-#
-# Source function library.
-. /etc/init.d/functions
-
-RETVAL=0
-FETCHMAIL_CONFIGFILE=/etc/fetchmailrc
-FETCHMAIL_PIDFILE=/var/run/fetchmail/fetchmail.pid
-
-prog="fetchmail"
-user="fetchmail"
-
-start() {
-	echo -n $"Starting $prog: "
-        ${prog} \
-	   -m "/usr/sbin/sendmail -i -f %F -- %T" \
-	   -L /var/log/fetchmail/fetchmail.log \
-	   -f ${FETCHMAIL_CONFIGFILE} \
-    	   --pidfile ${FETCHMAIL_PIDFILE}
-	evaluate_retval
-	echo
-}
-
-stop() {
-	echo -n $"Stopping $prog: "
-	[ -e ${FETCHMAIL_PIDFILE} ] && {
-	   PID=`head -n1 ${FETCHMAIL_PIDFILE}`
-	   kill -9 $PID
-           RETVAL=$?
-	   evaluate_retval
-	   rm -f ${FETCHMAIL_PIDFILE}
-	   echo
-	}
-}	
-
-restart() {
-  	stop
-	start
-}	
-
-case "$1" in
-  start)
-  	start
-	;;
-  stop)
-  	stop
-	;;
-  restart)
-  	restart
-	;;
-  *)
-	echo $"Usage: $0 {start|stop|restart}"
-	exit 1
-esac
-
-exit $?
diff --git a/fetchmail-tmpfiles.conf b/fetchmail-tmpfiles.conf
new file mode 100644
index 0000000..44228d7
--- /dev/null
+++ b/fetchmail-tmpfiles.conf
@@ -0,0 +1 @@
+d /run/fetchmail 750 vmail vmail
diff --git a/fetchmail.service b/fetchmail.service
new file mode 100644
index 0000000..64c1182
--- /dev/null
+++ b/fetchmail.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Fetchmail
+After=network.target
+
+[Service]
+User=fetchmail
+ExecStart=/usr/bin/fetchmail -d 900 -f /etc/fetchmailrc
+RestartSec=1
+
+[Install]
+WantedBy=multi-user.target
diff --git a/fetchmail.spec b/fetchmail.spec
index 3ec7562..7703132 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -2,22 +2,25 @@
 %define fetchmail_groupid 65040
 %define vmail_groupid 64901
 %define vmail_userid  64907
+%define majver %(echo %version | cut -d. -f1-2)
 
 Name:          fetchmail
-Version:       6.3.26
-Release:       2mamba
+Version:       6.4.2
+Release:       1mamba
 Summary:       A mail-retrieval and forwarding utility
 Group:         Applications/Networking
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://fetchmail.berlios.de/
-Source:        http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
-Source1:       %{name}-initscript
+Source:        https://sourceforge.net/projects/fetchmail/files/branch_%{majver}/fetchmail-%{version}.tar.xz
+Source1:       fetchmail.service
 Source2:       %{name}-fetchmailrc
+Source3:       fetchmail-tmpfiles.conf
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
+BuildRequires: ldconfig
 BuildRequires: libopenssl-devel
 BuildRequires: libpython-devel
 ## AUTOBUILDREQ-END
@@ -46,10 +49,10 @@ The  fetchmail program can gather mail from servers supporting any of the common
    pythondir=%{python_sitearch} \
    pyexecdir=%{python_sitelib}
 
-install -D -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/fetchmail
+install -D -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/fetchmail.service
 install -D -m0640 %{SOURCE2} %{buildroot}%{_sysconfdir}/fetchmailrc
+install -D -m0640 %{SOURCE3} %{buildroot}%{_tmpfilesdir}/fetchmail.conf
 install -d %{buildroot}/var/log/fetchmail/
-install -d %{buildroot}/var/run/fetchmail/
 
 %find_lang %{name}
 
@@ -57,36 +60,48 @@ install -d %{buildroot}/var/run/fetchmail/
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
 %pre
-groupadd vmail -g %{vmail_groupid} 2>/dev/null
-useradd -u %{vmail_userid} -c 'Virtual Mailboxes' -d /var/vmail -g vmail \
-   -s /bin/false vmail 2>/dev/null
-exit 0
+if [ $1 -ge 1 ]; then
+   groupadd vmail -g %{vmail_groupid} 2>/dev/null
+   useradd -u %{vmail_userid} -c 'Virtual Mailboxes' -d /var/vmail -g vmail \
+       -s /bin/false vmail 2>/dev/null
+fi
+:
 
 %preun
-# erase
-if [ $1 -eq 0 ]; then
-   [ -e /var/run/fetchmail/fetchmail.pid ] && %{_initrddir}/fetchmail stop
-   chkconfig --del fetchmail
-fi
-userdel fetchmail 2>/dev/null
-groupdel fetchmail 2>/dev/null
-exit 0
+%systemd_preun fetchmail
+:
+
+%post
+%systemd_post fetchmail
+:
+
+%postun
+%systemd_postun fetchmail
+:
+
+%posttrans
+# clean broken old sysv links
+find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
+:
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%{_initrddir}/fetchmail
+%{_unitdir}/fetchmail.service
 %attr(0640,vmail,vmail) %config(noreplace) %{_sysconfdir}/fetchmailrc
+%{_tmpfilesdir}/fetchmail.conf
 %{_bindir}/fetchmail
 %{_bindir}/fetchmailconf
 %{python_sitearch}/fetchmailconf.py*
 %attr(0750,vmail,vmail) %dir /var/log/fetchmail
-%attr(0755,vmail,vmail) %dir /var/run/fetchmail
-%{_mandir}/man1/fetchmail.1.gz
-%{_mandir}/man1/fetchmailconf.1.gz
+%{_mandir}/man1/fetchmail.1*
+%{_mandir}/man1/fetchmailconf.1*
 %doc COPYING
 #NEWS README README.NTLM README.SSL TODO
 
 %changelog
+* Sat Feb 22 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 6.4.2-1mamba
+- update to 6.4.2
+
 * Thu May 30 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 6.3.26-2mamba
 - python 2.7 rebuild