diff --git a/bluez.changes b/bluez.changes
index c5f9623..4eba8da 100644
--- a/bluez.changes
+++ b/bluez.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Oct  8 08:24:15 UTC 2013 - dimstar@opensuse.org
+
+- Do not package systemd user session service file.
+- Change DBus user service to be self-contained, and not rely on
+  Systemd activation (bnc#842688).
+
 -------------------------------------------------------------------
 Sat Sep 14 08:01:17 UTC 2013 - crrodriguez@opensuse.org
 
diff --git a/bluez.spec b/bluez.spec
index f5fa2b1..58833f6 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -18,6 +18,7 @@
 
 
 Name:           bluez
+# FIXME: Do not mangle dbus service / systemd service once we support systemd user services
 BuildRequires:  flex
 BuildRequires:  libcap-ng-devel
 BuildRequires:  systemd-devel
@@ -118,6 +119,10 @@ BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A.
 cp %{SOURCE6} .
 mkdir dbus-apis
 cp -a doc/*.txt dbus-apis/
+# FIXME: Change the dbus service to be a real service, not systemd launched
+sed -i "s:Exec=/bin/false:Exec=%{_libexecdir}/bluetooth/obexd:g" obexd/src/org.bluez.obex.service
+sed -i "/SystemdService=.*/d" obexd/src/org.bluez.obex.service
+# END FIXME
 
 %build
 # autoreconf -fiv
@@ -148,6 +153,10 @@ fi
 # no idea why this is suddenly necessary...
 install --mode 0755 -d %{buildroot}%{_localstatedir}/lib/bluetooth
 
+# FIXME: Do not delete the systemd service once we support systemd user/session services
+rm %{buildroot}%{_prefix}/lib/systemd/user/obex.service
+# end FIXME
+
 %check
 %if ! 0%{?qemu_user_space_build}
 make check
@@ -214,7 +223,6 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/modprobe.d
 %config(noreplace) %{_sysconfdir}/modprobe.d/50-bluetooth.conf
 %{_unitdir}/bluetooth.service
-/usr/lib/systemd/user/obex.service 
 %{_datadir}/dbus-1/system-services/org.bluez.service
 %{_datadir}/dbus-1/services/org.bluez.obex.service