diff --git a/distcc-sysusers.conf b/distcc-sysusers.conf
new file mode 100644
index 0000000..c026a44
--- /dev/null
+++ b/distcc-sysusers.conf
@@ -0,0 +1,2 @@
+g distcc - -
+u distcc - "distcc user" /usr/bin/nologin
diff --git a/distcc.spec b/distcc.spec
index 97b0e2d..38b582b 100644
--- a/distcc.spec
+++ b/distcc.spec
@@ -1,7 +1,7 @@
 %define distcc_uid 28
 %define distcc_gid 28
 Name:          distcc
-Version:       3.3.3
+Version:       3.3.5
 Release:       1mamba
 Summary:       A program to distribute builds of C, C++, Objective C or Objective C++ code across several machines on a network
 Group:         Development/Tools
@@ -14,6 +14,8 @@ Source1:       distcc-initscript
 Source2:       distcc-logrotate
 Source3:       distcc-sysconfig
 Source4:       distcc-profile
+Source5:       distccd.service
+Source6:       distcc-sysusers.conf
 Patch0:        distcc-3.1-gcc-4.8.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
@@ -56,26 +58,30 @@ Summary:       Monitoring interface for distcc
 %description monitor
 A gnome base monitoring interface for distcc, a program to distribute builds of C, C++, Objective C or Objective.
 
+%debug_package
+
 %prep
 %setup -q
 #%patch0 -p0
+./autogen.sh
 
 %build
-./autogen.sh
 %configure \
    --with-gnome \
    --disable-Werror \
-   PYTHON=%{__python36}
+   PYTHON=%{__python3}
 
 %make
 
 %install
+[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
+
 %makeinstall
 
-install -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/distccd
-install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/distccd
-install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/distccd
-install -D -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/distcc.sh
+install -D -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/distccd
+install -D -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/distccd
+install -D -m0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/distcc.sh
+install -D -m0644 %{SOURCE5} %{buildroot}%{_unitdir}/distccd
 install -d %{buildroot}/var/log/distccd
 
 %clean
@@ -88,23 +94,19 @@ if [ $1 -ge 1 ]; then
    useradd distcc -c "Distcc user" -d /dev/null \
          -s /bin/false -u %{distcc_uid} -g %{distcc_gid} 2>/dev/null || true
 fi
-exit 0
+:
+
+%preun
+%systemd_preun distccd
+:
 
 %post
-# upgrade
-if [ $1 -eq 1 ]; then
-   service distccd condrestart
-fi
-exit 0
+%systemd_post distccd
+:
 
 %postun
-if [ $1 -eq 0 ]; then
-# erase
-   chkconfig --del distccd
-   service distccd stop
-   userdel distcc || true
-fi
-exit 0
+%systemd_postun distccd
+:
 
 %files
 %defattr(-,root,root)
@@ -115,15 +117,15 @@ exit 0
 %{_sysconfdir}/distcc/commands.allow.sh
 %{_sysconfdir}/distcc/hosts
 %{_sysconfdir}/profile.d/distcc.sh
-%{_initrddir}/distccd
 %{_bindir}/distcc
 %{_bindir}/distccd
 %{_bindir}/distccmon-text
 %{_bindir}/lsdistcc
 %{_bindir}/pump
 %{_sbindir}/update-distcc-symlinks
-%{python36_sitearch}/include_server/*
-%{python36_sitearch}/include_server-%{version}-py%{python36_version}.egg-info
+%{_unitdir}/distccd
+%{python3_sitearch}/include_server/*
+%{python3_sitearch}/include_server-%{version}-py*.egg-info
 %dir %{_datadir}/doc/distcc
 %{_datadir}/doc/distcc/*
 %{_mandir}/man1/*
@@ -132,10 +134,13 @@ exit 0
 %files monitor
 %defattr(-,root,root)
 %{_bindir}/distccmon-gnome
-%{_datadir}/distcc/distccmon-gnome-icon.png
-%{_datadir}/distcc/distccmon-gnome.desktop
+%{_datadir}/applications/distccmon-gnome.desktop
+%{_datadir}/pixmaps/distccmon-gnome.png
 
 %changelog
+* Fri Jan 15 2021 Automatic Build System <autodist@mambasoft.it> 3.3.5-1mamba
+- automatic version update by autodist
+
 * Thu Aug 22 2019 Automatic Build System <autodist@mambasoft.it> 3.3.3-1mamba
 - automatic version update by autodist
 
@@ -164,5 +169,5 @@ exit 0
 - update to version 2.18.3 by autospec
 - added distcc user creation
 
-* Mon Oct 22 2003 Silvan Calarco <silvan.calarco@mambasoft.it> 2.11.1-1qilnx
+* Wed Oct 22 2003 Silvan Calarco <silvan.calarco@mambasoft.it> 2.11.1-1qilnx
 - first build
diff --git a/distccd.service b/distccd.service
new file mode 100644
index 0000000..67cb9c2
--- /dev/null
+++ b/distccd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Distributed C, C++ and Objective-C compiler
+Documentation=man:distccd(1)
+After=network.target
+
+[Service]
+User=distcc
+EnvironmentFile=/etc/sysconfig/distccd
+ExecStart=/usr/bin/distccd --no-detach --daemon $DISTCC_ARGS
+
+[Install]
+WantedBy=multi-user.target