diff --git a/rpm/nemo-qml-plugin-devicelock.spec b/rpm/nemo-qml-plugin-devicelock.spec
index 17814da..fb815d2 100644
--- a/rpm/nemo-qml-plugin-devicelock.spec
+++ b/rpm/nemo-qml-plugin-devicelock.spec
@@ -61,8 +61,8 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 %qmake5_install
 
-mkdir -p %{buildroot}/lib/systemd/system/multi-user.target.wants
-ln -sf ../nemo-devicelock.socket %{buildroot}/lib/systemd/system/multi-user.target.wants/
+mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
+ln -sf ../nemo-devicelock.socket %{buildroot}%{_unitdir}/multi-user.target.wants/
 
 %post -p /sbin/ldconfig
 
@@ -75,14 +75,14 @@ ln -sf ../nemo-devicelock.socket %{buildroot}/lib/systemd/system/multi-user.targ
 %{_libdir}/qt5/qml/org/nemomobile/devicelock/libnemodevicelockplugin.so
 %{_libdir}/qt5/qml/org/nemomobile/devicelock/plugins.qmltypes
 %{_libdir}/qt5/qml/org/nemomobile/devicelock/qmldir
-/lib/systemd/system/nemo-devicelock.socket
-/lib/systemd/system/multi-user.target.wants/nemo-devicelock.socket
+%{_unitdir}/nemo-devicelock.socket
+%{_unitdir}/multi-user.target.wants/nemo-devicelock.socket
 %config %{_sysconfdir}/dbus-1/system.d/org.nemomobile.devicelock.conf
 
 %files -n nemo-devicelock-daemon-cli
 %defattr(-,root,root,-)
 %{_libexecdir}/nemo-devicelock
-/lib/systemd/system/nemo-devicelock.service
+%{_unitdir}/nemo-devicelock.service
 
 %files devel
 %defattr(-,root,root,-)
diff --git a/src/daemon/daemon.pro b/src/daemon/daemon.pro
index 3e66f55..c52089a 100644
--- a/src/daemon/daemon.pro
+++ b/src/daemon/daemon.pro
@@ -37,7 +37,7 @@ target.path = /usr/libexec
 
 systemd.files = \
         systemd/nemo-devicelock.service
-systemd.path= /lib/systemd/system
+systemd.path= /usr/lib/systemd/system
 
 INSTALLS += \
         systemd \
diff --git a/systemd/systemd.pri b/systemd/systemd.pri
index 4a545ad..bb6fd8f 100644
--- a/systemd/systemd.pri
+++ b/systemd/systemd.pri
@@ -1,7 +1,7 @@
 
 systemd.files = \
         $$PWD/nemo-devicelock.socket
-systemd.path= /lib/systemd/system
+systemd.path= /usr/lib/systemd/system
 
 policy.files = \
         $$PWD/org.nemomobile.devicelock.conf