diff --git a/at.changes b/at.changes
index 2261470..1621b7e 100644
--- a/at.changes
+++ b/at.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jun  4 01:03:54 UTC 2015 - crrodriguez@opensuse.org
+
+- atd.service: run After=nss-user-lookup.target not after
+  systemd-user-sessions.service
+- atd.service: run After=time-sync.target 
+
 -------------------------------------------------------------------
 Mon Oct  6 20:32:38 UTC 2014 - lchiquitto@suse.com
 
diff --git a/at.spec b/at.spec
index 3b6dea5..63e8b0e 100644
--- a/at.spec
+++ b/at.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package at
 #
-# Copyright (c) 2014 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
diff --git a/atd.service b/atd.service
index 9352b26..9afedc1 100644
--- a/atd.service
+++ b/atd.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Deferred execution scheduler
-After=systemd-user-sessions.service
+After=nss-user-lookup.target time-sync.target
 
 [Service]
 ExecStart=/usr/sbin/atd -f