diff --git a/syncthing.changes b/syncthing.changes
index 7a0a5a6..37ba1c3 100644
--- a/syncthing.changes
+++ b/syncthing.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat May 29 12:40:56 UTC 2021 - Fabian Niepelt <fniepelt@takios.de>
+
+- Fix User, Group, EnvironmentFile and ReadWritePaths in systemd.service unit
+
 -------------------------------------------------------------------
 Fri May 14 08:02:12 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
 
diff --git a/syncthing.spec b/syncthing.spec
index d90f2f2..2de8b36 100644
--- a/syncthing.spec
+++ b/syncthing.spec
@@ -81,6 +81,14 @@ sed -i '/Service\]/a EnvironmentFile=-\/etc\/default/strelaysrv'    \
   %{buildroot}%{_unitdir}/strelaysrv.service
 sed -i 's,^ExecStart=.*,ExecStart=/usr/bin/strelaysrv $OPTIONS,'    \
   %{buildroot}%{_unitdir}/strelaysrv.service
+sed -i 's,EnvironmentFile=/etc/default/syncthing-relaysrv,EnvironmentFile=-/etc/default/syncthing-relaysrv,'    \
+  %{buildroot}%{_unitdir}/strelaysrv.service
+sed -i 's/^User=.*/User=strelaysrv/'    \
+  %{buildroot}%{_unitdir}/strelaysrv.service
+sed -i 's/^Group=.*/Group=strelaysrv/'    \
+  %{buildroot}%{_unitdir}/strelaysrv.service
+sed -i 's,^ReadWritePaths=.*,ReadWritePaths=/var/lib/strelaysrv,'    \
+  %{buildroot}%{_unitdir}/strelaysrv.service
 install -Dpm 0644 etc/linux-systemd/system/%{name}@.service        \
   %{buildroot}%{_unitdir}/%{name}@.service
 install -Dpm 0644 etc/linux-systemd/system/%{name}-resume.service  \