diff --git a/README.md b/README.md
index cb7462a..5f0e145 100644
--- a/README.md
+++ b/README.md
@@ -72,12 +72,10 @@ The `<username>` bit should be replaced with your username or that of any other
 
 #### systemd
 
-Note that this method assumes you have Gitwatch installed in `/opt/gitwatch`
-
-- Copy `gitwatch.service` to `$HOME/.config/systemd/user`
-- Start and enable the service for a given path by running `systemctl --user enable --now gitwatch.service@/path/to/folder/to/monitor`
+- If installed to a path other than `/usr/local/bin/gitwatch`, modify `gitwatch@.service` to suit
+- Create dir if it does not exist and copy systemd service file with `mkdir -p "$HOME/.config/systemd/user" && cp gitwatch@.service $HOME/.config/systemd/user`
+- Start and enable the service for a given path by running `systemctl --user --now enable gitwatch@$(systemd-escape "/path/to/folder/to/monitor").service`
 
 ## Other Articles
-
 ### On the Gitwatch Wiki
 * [How to install `gitwatch` as a Debian service with `supervisord`](https://github.com/nevik/gitwatch/wiki/gitwatch-as-a-service-on-Debian-with-supervisord)
diff --git a/gitwatch.service b/gitwatch@.service
similarity index 56%
rename from gitwatch.service
rename to gitwatch@.service
index bbfd76a..416d4f0 100644
--- a/gitwatch.service
+++ b/gitwatch@.service
@@ -2,5 +2,8 @@
 Description=Watch file or directory and git commit all changes
 
 [Service]
-ExecStart=/opt/gitwatch/gitwatch.sh %I
+ExecStart=/usr/local/bin/gitwatch "%I"
 ExecStop=/bin/true
+
+[Install]
+WantedBy=multi-user.target