diff --git a/software/build-scripts/PKGBUILD.arch b/software/build-scripts/PKGBUILD.arch
index 5e56493..0c14506 100644
--- a/software/build-scripts/PKGBUILD.arch
+++ b/software/build-scripts/PKGBUILD.arch
@@ -17,5 +17,7 @@ package() {
   install -Dvm755 "${srcdir}/infnoise/software/infnoise" "${pkgdir}/usr/bin/infnoise"
   install -Dvm644 "${srcdir}/infnoise/software/init_scripts/75-infnoise.rules" "${pkgdir}/etc/udev/rules.d/75-infnoise.rules"
   install -Dvm644 "${srcdir}/infnoise/software/init_scripts/infnoise.conf.systemd" "${pkgdir}/etc/infnoise.conf"
-  install -Dvm644 "${srcdir}/infnoise/software/init_scripts/infnoise.service.bin" "${pkgdir}/etc/systemd/system/infnoise.service"
+  install -Dvm644 "${srcdir}/infnoise/software/init_scripts/infnoise.service.bin" "${pkgdir}/lib/systemd/system/infnoise.service"
 }
+
+
diff --git a/software/build-scripts/build.sh b/software/build-scripts/build.sh
index 1241e5f..2accfba 100755
--- a/software/build-scripts/build.sh
+++ b/software/build-scripts/build.sh
@@ -18,12 +18,12 @@ echo "Architecture: $ARCH" >> build/DEBIAN/control
 
 mkdir -p build/usr/sbin/
 mkdir -p build/etc/udev/rules.d/
-mkdir -p build/etc/systemd/system/
+mkdir -p build/lib/systemd/system/
 
 cp infnoise build/usr/sbin/
 cp init_scripts/infnoise.conf.systemd build/etc/infnoise.conf
 cp init_scripts/75-infnoise.rules build/etc/udev/rules.d/75-infnoise.rules
-cp init_scripts/infnoise.service.sbin build/etc/systemd/system/infnoise.service
+cp init_scripts/infnoise.service.sbin build/lib/systemd/system/infnoise.service
 
 if [ ! -e build/usr/sbin/infnoise ] ; then
 	echo "$2 binary missing"
diff --git a/software/build-scripts/infnoise.postinst b/software/build-scripts/infnoise.postinst
index 09360cd..fb998b5 100644
--- a/software/build-scripts/infnoise.postinst
+++ b/software/build-scripts/infnoise.postinst
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-systemctl daemon-reload
+systemctl --system daemon-reload
 systemctl enable infnoise
 
-#service infnoise start
 service udev reload
diff --git a/software/build-scripts/infnoise.spec b/software/build-scripts/infnoise.spec
index 80a0296..d20b8d3 100644
--- a/software/build-scripts/infnoise.spec
+++ b/software/build-scripts/infnoise.spec
@@ -26,6 +26,16 @@ install -Dvm644 "init_scripts/infnoise.conf.systemd" "$RPM_BUILD_ROOT/etc/infnoi
 install -Dvm644 "init_scripts/75-infnoise.rules" "$RPM_BUILD_ROOT/usr/lib/udev/rules.d/75-infnoise.rules"
 install -Dvm644 "init_scripts/infnoise.service.bin" "$RPM_BUILD_ROOT/usr/lib/systemd/system/infnoise.service"
 
+%post
+systemctl daemon-reload
+systemctl enable infnoise.service
+systemctl daemon-reload
+
+%preun
+systemctl stop infnoise.service >/dev/null 2>&1
+systemctl disable infnoise.service
+systemctl daemon-reload
+
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT