diff --git a/_constraints b/_constraints
new file mode 100644
index 0000000..03d38d4
--- /dev/null
+++ b/_constraints
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<constraints>
+  <overwrite>
+    <conditions>
+      <package>glibc-testsuite</package>
+    </conditions>
+    <hardware>
+      <memory>
+	<size unit="M">1500</size>
+      </memory>
+    </hardware>
+    <sandbox exclude="true">xen</sandbox>
+  </overwrite>
+</constraints>
diff --git a/glibc-testsuite.changes b/glibc-testsuite.changes
index 621a553..56a90b3 100644
--- a/glibc-testsuite.changes
+++ b/glibc-testsuite.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Apr  1 13:33:24 UTC 2014 - schwab@suse.de
+
+- Readd dependency on sysvinit.target to nscd.service (bnc#868422)
+- Make the nscd service part of the nss-lookup and nss-user-lookup targets
+  (bnc#871386)
+- Move _constraints back to main package and update it
+
 -------------------------------------------------------------------
 Tue Apr  1 07:55:19 UTC 2014 - schwab@suse.de
 
@@ -10,7 +18,7 @@ Tue Apr  1 07:55:19 UTC 2014 - schwab@suse.de
 Mon Mar 31 13:22:56 UTC 2014 - schwab@suse.de
 
 - powerpc-opt-power8.patch: readd POWER8 implementation of isnan,
-  isinf, finite with fix for little endian
+  isinf, finite with fix for little endian (bnc#871353)
 - pthread-mutex-destroy.patch: Skip checks in pthread_mutex_destroy when
   doing elision (bnc#865968)
 
diff --git a/glibc-utils.changes b/glibc-utils.changes
index 621a553..56a90b3 100644
--- a/glibc-utils.changes
+++ b/glibc-utils.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Apr  1 13:33:24 UTC 2014 - schwab@suse.de
+
+- Readd dependency on sysvinit.target to nscd.service (bnc#868422)
+- Make the nscd service part of the nss-lookup and nss-user-lookup targets
+  (bnc#871386)
+- Move _constraints back to main package and update it
+
 -------------------------------------------------------------------
 Tue Apr  1 07:55:19 UTC 2014 - schwab@suse.de
 
@@ -10,7 +18,7 @@ Tue Apr  1 07:55:19 UTC 2014 - schwab@suse.de
 Mon Mar 31 13:22:56 UTC 2014 - schwab@suse.de
 
 - powerpc-opt-power8.patch: readd POWER8 implementation of isnan,
-  isinf, finite with fix for little endian
+  isinf, finite with fix for little endian (bnc#871353)
 - pthread-mutex-destroy.patch: Skip checks in pthread_mutex_destroy when
   doing elision (bnc#865968)
 
diff --git a/glibc.changes b/glibc.changes
index 621a553..56a90b3 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Apr  1 13:33:24 UTC 2014 - schwab@suse.de
+
+- Readd dependency on sysvinit.target to nscd.service (bnc#868422)
+- Make the nscd service part of the nss-lookup and nss-user-lookup targets
+  (bnc#871386)
+- Move _constraints back to main package and update it
+
 -------------------------------------------------------------------
 Tue Apr  1 07:55:19 UTC 2014 - schwab@suse.de
 
@@ -10,7 +18,7 @@ Tue Apr  1 07:55:19 UTC 2014 - schwab@suse.de
 Mon Mar 31 13:22:56 UTC 2014 - schwab@suse.de
 
 - powerpc-opt-power8.patch: readd POWER8 implementation of isnan,
-  isinf, finite with fix for little endian
+  isinf, finite with fix for little endian (bnc#871353)
 - pthread-mutex-destroy.patch: Skip checks in pthread_mutex_destroy when
   doing elision (bnc#865968)
 
diff --git a/nscd.service b/nscd.service
index bacc6e3..2170cbc 100644
--- a/nscd.service
+++ b/nscd.service
@@ -1,5 +1,8 @@
 [Unit]
 Description=Name Service Cache Daemon
+After=sysinit.target
+Wants=nss-lookup.target nss-user-lookup.target
+Before=nss-lookup.target nss-user-lookup.target
 
 [Service]
 Type=forking