diff --git a/etc/linux-systemd/system/syncthing@.service b/etc/linux-systemd/system/syncthing@.service
index 12528537f..a2ec02989 100644
--- a/etc/linux-systemd/system/syncthing@.service
+++ b/etc/linux-systemd/system/syncthing@.service
@@ -1,13 +1,12 @@
 [Unit]
-Description=Syncthing service for %i
+Description=Syncthing - Open Source Continuous File Synchronization for %I
+Documentation=https://github.com/syncthing/syncthing/wiki
 After=network.target
 
 [Service]
 User=%i
-Environment=STARGS=
-EnvironmentFile=-/etc/default/syncthing
 Environment=STNORESTART=yes
-ExecStart=/usr/bin/syncthing ${STARGS}
+ExecStart=/usr/bin/syncthing
 Restart=on-failure
 RestartPreventExitStatus=1
 SuccessExitStatus=2
diff --git a/etc/linux-systemd/user/syncthing.service b/etc/linux-systemd/user/syncthing.service
index e0c51b87a..705f5f634 100644
--- a/etc/linux-systemd/user/syncthing.service
+++ b/etc/linux-systemd/user/syncthing.service
@@ -1,15 +1,15 @@
 [Unit]
-Description=Syncthing service
+Description=Syncthing - Open Source Continuous File Synchronization
+Documentation=https://github.com/syncthing/syncthing/wiki
+After=network.target
 
 [Service]
-Environment=STARGS=
-EnvironmentFile=-%h/.config/syncthing/environment
 Environment=STNORESTART=yes
-ExecStart=/usr/bin/syncthing ${STARGS}
+ExecStart=/usr/bin/syncthing
 Restart=on-failure
 RestartPreventExitStatus=1
 SuccessExitStatus=2
 RestartForceExitStatus=3 4
 
 [Install]
-WantedBy=cmdline.target
+WantedBy=default.target