diff --git a/software/init_scripts/75-infnoise.rules b/software/init_scripts/75-infnoise.rules
index 71f55f1..78172c0 100644
--- a/software/init_scripts/75-infnoise.rules
+++ b/software/init_scripts/75-infnoise.rules
@@ -1,2 +1,2 @@
-SUBSYSTEM=="tty", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6015", SYMLINK+="infnoise" 
+SUBSYSTEM=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6015", SYMLINK+="infnoise" 
 ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6015" ,TAG+="systemd", ENV{SYSTEMD_WANTS}="infnoise.service"
diff --git a/software/init_scripts/README.md b/software/init_scripts/README.md
index f1fd335..a6e596f 100644
--- a/software/init_scripts/README.md
+++ b/software/init_scripts/README.md
@@ -8,5 +8,8 @@ Should someone create distribution packages for infnoise in future, hopefully th
 
 - `infnoise`: OpenRC, tested in Gentoo, untested in Alpine Linux, FreeBSD, TrueOS
 - `infnoise.conf`: Upstart, tested in Ubuntu 14.04, 16.04 (requires upstart install)
-- `infnoise.service`: Systemd, untested in Redhat, Ubuntu etc
+- `infnoise.service`: Systemd, works for CentOS, Ubuntu, Debian, ArchLinux
+- `infnoise.service.bin`: Same as infnoise.service, binary path = /usr/bin/
+- `infnoise.service.sbin`: Same as infnoise.service, binary path = /usr/sbin/
+- `75-infnoise.rules`: udev rule to be used together with the systemd service
 
diff --git a/software/init_scripts/infnoise b/software/init_scripts/infnoise.gentoo.openrc
similarity index 100%
rename from software/init_scripts/infnoise
rename to software/init_scripts/infnoise.gentoo.openrc
diff --git a/software/scripts/infnoise.openrc b/software/init_scripts/infnoise.openrc
similarity index 100%
rename from software/scripts/infnoise.openrc
rename to software/init_scripts/infnoise.openrc
diff --git a/software/init_scripts/infnoise.service b/software/init_scripts/infnoise.service
index 8d602f1..06747b6 100644
--- a/software/init_scripts/infnoise.service
+++ b/software/init_scripts/infnoise.service
@@ -1,5 +1,7 @@
 [Unit]
 Description=Wayward Geek InfNoise TRNG driver
+BindsTo=dev-infnoise.device
+After=dev-infnoise.device
 
 [Service]
 Type=forking
@@ -7,9 +9,7 @@ WorkingDirectory=/tmp
 ExecStart=/usr/local/sbin/infnoise --dev-random --daemon --pidfile /var/run/infnoise.pid
 User=root
 Group=root
-Restart=no
-BindsTo=dev-infnoise.device
-After=dev-infnoise.device
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/software/init_scripts/infnoise.service.archlinux b/software/init_scripts/infnoise.service.archlinux
deleted file mode 100644
index bddff9d..0000000
--- a/software/init_scripts/infnoise.service.archlinux
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Wayward Geek InfNoise TRNG driver
-
-[Service]
-Type=forking
-WorkingDirectory=/tmp
-ExecStart=/usr/bin/infnoise --dev-random --daemon --pidfile /var/run/infnoise.pid
-User=root
-Group=root
-Restart=no
-BindsTo=dev-infnoise.device
-After=dev-infnoise.device
-
-[Install]
-WantedBy=multi-user.target
diff --git a/software/scripts/infnoise.service.archlinux b/software/init_scripts/infnoise.service.bin
similarity index 100%
rename from software/scripts/infnoise.service.archlinux
rename to software/init_scripts/infnoise.service.bin
diff --git a/software/scripts/infnoise.service b/software/init_scripts/infnoise.service.sbin
similarity index 71%
rename from software/scripts/infnoise.service
rename to software/init_scripts/infnoise.service.sbin
index 06747b6..9fbb8e0 100644
--- a/software/scripts/infnoise.service
+++ b/software/init_scripts/infnoise.service.sbin
@@ -6,7 +6,7 @@ After=dev-infnoise.device
 [Service]
 Type=forking
 WorkingDirectory=/tmp
-ExecStart=/usr/local/sbin/infnoise --dev-random --daemon --pidfile /var/run/infnoise.pid
+ExecStart=/usr/sbin/infnoise --dev-random --daemon --pidfile /var/run/infnoise.pid
 User=root
 Group=root
 Restart=always
diff --git a/software/scripts/75-infnoise.rules b/software/scripts/75-infnoise.rules
deleted file mode 100644
index 78172c0..0000000
--- a/software/scripts/75-infnoise.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBSYSTEM=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6015", SYMLINK+="infnoise" 
-ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6015" ,TAG+="systemd", ENV{SYSTEMD_WANTS}="infnoise.service"