--- a/systemd/gpsd.service
+++ b/systemd/gpsd.service
@@ -7,9 +7,7 @@ After=chronyd.service
 [Service]
 Type=forking
 EnvironmentFile=-/etc/default/gpsd
-EnvironmentFile=-/etc/sysconfig/gpsd
-ExecStart=/usr/local/sbin/gpsd $GPSD_OPTIONS $OPTIONS $DEVICES
+ExecStart=/usr/sbin/gpsd $GPSD_OPTIONS $DEVICES
 
 [Install]
-WantedBy=multi-user.target
 Also=gpsd.socket
--- a/systemd/gpsdctl@.service.in
+++ b/systemd/gpsdctl@.service.in
@@ -10,5 +10,5 @@ Environment="GPSD_SOCKET=/var/run/gpsd.s
 EnvironmentFile=-/etc/default/gpsd
 EnvironmentFile=-/etc/sysconfig/gpsd
 RemainAfterExit=yes
-ExecStart=/bin/sh -c "[ \"$USBAUTO\" = true ] && /usr/local/sbin/gpsdctl add /dev/%I || :"
-ExecStop=/bin/sh -c "[ \"$USBAUTO\" = true ] && /usr/local/sbin/gpsdctl remove /dev/%I || :"
+ExecStart=/bin/sh -c "[ \"$USBAUTO\" = true ] && /usr/sbin/gpsdctl add /dev/%I || :"
+ExecStop=/bin/sh -c "[ \"$USBAUTO\" = true ] && /usr/sbin/gpsdctl remove /dev/%I || :"
