diff --git a/data/mapplauncherd.target b/data/mapplauncherd.target
index 4bab3cc..dce6fa3 100644
--- a/data/mapplauncherd.target
+++ b/data/mapplauncherd.target
@@ -1,2 +1,4 @@
 [Unit]
 Description=Application launch boosters
+Requires=pre-user-session.target
+After=pre-user-session.target
diff --git a/rpm/mapplauncherd.spec b/rpm/mapplauncherd.spec
index dd9ab8c..85e7d5f 100644
--- a/rpm/mapplauncherd.spec
+++ b/rpm/mapplauncherd.spec
@@ -1,6 +1,6 @@
 # 
 # Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.25
+# Generated by: spectacle version 0.26
 # 
 
 Name:       mapplauncherd
@@ -16,6 +16,7 @@ License:    LGPLv2+
 URL:        https://github.com/nemomobile/mapplauncherd/
 Source0:    %{name}-%{version}.tar.bz2
 Source100:  mapplauncherd.yaml
+Requires:   systemd-user-session-targets
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(x11)
@@ -42,7 +43,7 @@ Summary:    Development files for launchable applications
 Group:      Development/Tools
 Requires:   %{name} = %{version}-%{release}
 Provides:   meegotouch-applauncherd-devel > 3.0.3
-Obsoletes:   meegotouch-applauncherd-devel <= 3.0.3
+Obsoletes:  meegotouch-applauncherd-devel <= 3.0.3
 
 %description devel
 Development files for creating applications that can be launched
@@ -69,7 +70,6 @@ Requires:   mapplauncherd-qt
 Test scripts used for testing meegotouch-applauncherd.
 
 
-
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -104,11 +104,12 @@ mv %{buildroot}/usr/share/applauncherd-tests %{buildroot}/usr/lib
 # Don't use %exclude, remove at install phase
 rm -f %{buildroot}/usr/share/fala_images/fala_qml_helloworld
 
-mkdir %{buildroot}/usr/lib/systemd/user/mapplauncherd.target.wants || true
+mkdir -p %{buildroot}/usr/lib/systemd/user/user-session.target.wants || true
+ln -s ../mapplauncherd.target %{buildroot}/usr/lib/systemd/user/user-session.target.wants/
+mkdir -p %{buildroot}/usr/lib/systemd/user/mapplauncherd.target.wants || true
 ln -s ../booster-generic.service %{buildroot}/usr/lib/systemd/user/mapplauncherd.target.wants/
 # << install post
 
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -122,6 +123,7 @@ ln -s ../booster-generic.service %{buildroot}/usr/lib/systemd/user/mapplauncherd
 %{_libexecdir}/mapplauncherd/booster-generic
 %{_libdir}/systemd/user/booster-generic.service
 %{_libdir}/systemd/user/mapplauncherd.target.wants/booster-generic.service
+%{_libdir}/systemd/user/user-session.target.wants/mapplauncherd.target
 # >> files
 # << files
 
diff --git a/rpm/mapplauncherd.yaml b/rpm/mapplauncherd.yaml
index 07a0922..29caf62 100644
--- a/rpm/mapplauncherd.yaml
+++ b/rpm/mapplauncherd.yaml
@@ -24,6 +24,8 @@ PkgConfigBR:
 PkgBR:
     - cmake
     - python
+Requires:
+    - systemd-user-session-targets
 Provides:
     - meegotouch-applauncherd > 3.0.3
 Obsoletes:
@@ -37,6 +39,7 @@ Files:
     - "%{_libexecdir}/mapplauncherd/booster-generic"
     - "%{_libdir}/systemd/user/booster-generic.service"
     - "%{_libdir}/systemd/user/mapplauncherd.target.wants/booster-generic.service"
+    - "%{_libdir}/systemd/user/user-session.target.wants/mapplauncherd.target"
 
 SubPackages:
     - Name: devel
diff --git a/src/booster-generic/booster-generic.service b/src/booster-generic/booster-generic.service
index 778bb51..7581f42 100644
--- a/src/booster-generic/booster-generic.service
+++ b/src/booster-generic/booster-generic.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Generic application launch booster
-After=xorg.target
-Requires=dbus.socket xorg.target
+After=pre-user-session.target
+Requires=dbus.socket pre-user-session.target
 
 [Service]
 Type=notify