diff --git a/glibc.changes b/glibc.changes
index 8ce95dc..06808a3 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr  1 08:31:22 UTC 2014 - werner@suse.de
+
+- make nscd.service smart that is use/provide the synchronization
+  points nss-lookup.target and nss-user-lookup.target
+
 -------------------------------------------------------------------
 Mon Mar 31 13:22:56 UTC 2014 - schwab@suse.de
 
diff --git a/nscd.service b/nscd.service
index bacc6e3..7bc75d7 100644
--- a/nscd.service
+++ b/nscd.service
@@ -1,9 +1,13 @@
 [Unit]
 Description=Name Service Cache Daemon
+Wants=nss-lookup.target nss-user-lookup.target
+Before=nss-lookup.target nss-user-lookup.target
+ConditionPathExists=/etc/nscd.conf
 
 [Service]
-Type=forking
-ExecStart=/usr/sbin/nscd
+Type=simple
+PIDFile=/run/nscd/nscd.pid
+ExecStart=/usr/sbin/nscd --foreground
 ExecStop=/usr/sbin/nscd --shutdown
 ExecReload=/usr/sbin/nscd -i passwd
 ExecReload=/usr/sbin/nscd -i group
@@ -11,7 +15,6 @@ ExecReload=/usr/sbin/nscd -i hosts
 ExecReload=/usr/sbin/nscd -i services
 ExecReload=/usr/sbin/nscd -i netgroup
 Restart=always
-PIDFile=/run/nscd/nscd.pid
 
 [Install]
 WantedBy=multi-user.target