diff --git a/xen-dom0-modules.service b/xen-dom0-modules.service
index 3bc25a2..fea878f 100644
--- a/xen-dom0-modules.service
+++ b/xen-dom0-modules.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Load dom0 backend drivers
 ConditionPathExists=/proc/xen
-Before=proc-xen.mount
+Before=xenstored.service xen-watchdog.service
 
 [Install]
 WantedBy=multi-user.target
diff --git a/xen.changes b/xen.changes
index 6312ebc..b7d99c1 100644
--- a/xen.changes
+++ b/xen.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Dec 21 09:09:55 UTC 2015 - ohering@suse.de
+
+- Adjust xen-dom0-modules.service to run Before xenstored.service
+  instead of proc-xen.mount to workaround a bug in systemd "design"
+  (bnc#959845)
+
 -------------------------------------------------------------------
 Tue Nov 24 08:44:57 MST 2015 - carnold@suse.com
 
diff --git a/xen.spec b/xen.spec
index f9a3b32..bec9726 100644
--- a/xen.spec
+++ b/xen.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xen
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 # needssslcertforbuild
 
 Name:           xen