diff --git a/haveged.changes b/haveged.changes
index 2241d41..c44d883 100644
--- a/haveged.changes
+++ b/haveged.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 29 07:23:34 UTC 2014 - tchvatal@suse.com
+
+- Adjust the service to start early enough for all usecases.
+  Should fix bnc#892096.
+
 -------------------------------------------------------------------
 Tue Jun 10 08:27:54 UTC 2014 - tchvatal@suse.com
 
diff --git a/haveged.service b/haveged.service
index afbd527..e39e01d 100644
--- a/haveged.service
+++ b/haveged.service
@@ -1,13 +1,18 @@
 [Unit]
 Description=Entropy Daemon based on the HAVEGE algorithm
 Documentation=man:haveged(8) http://www.issihosts.com/haveged/
+DefaultDependencies=no
 ConditionVirtualization=!container
+Conflicts=shutdown.target
+After=systemd-random-seed.service
+Before=sysinit.target shutdown.target
 
 [Service]
 ExecStart=/usr/sbin/haveged -w 1024 -v 0 -F
 CapabilityBoundingSet=CAP_SYS_ADMIN
 PrivateNetwork=yes
+Restart=always
 SuccessExitStatus=137 143
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sysinit.target