diff --git a/glibc-testsuite.changes b/glibc-testsuite.changes
index 06808a3..8ce95dc 100644
--- a/glibc-testsuite.changes
+++ b/glibc-testsuite.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-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/glibc-utils.changes b/glibc-utils.changes
index 06808a3..8ce95dc 100644
--- a/glibc-utils.changes
+++ b/glibc-utils.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-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/glibc.changes b/glibc.changes
index 06808a3..8ce95dc 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-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 7bc75d7..bacc6e3 100644
--- a/nscd.service
+++ b/nscd.service
@@ -1,13 +1,9 @@
 [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=simple
-PIDFile=/run/nscd/nscd.pid
-ExecStart=/usr/sbin/nscd --foreground
+Type=forking
+ExecStart=/usr/sbin/nscd
 ExecStop=/usr/sbin/nscd --shutdown
 ExecReload=/usr/sbin/nscd -i passwd
 ExecReload=/usr/sbin/nscd -i group
@@ -15,6 +11,7 @@ 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