diff --git a/glibc-testsuite.changes b/glibc-testsuite.changes
index 9f97669..0bdc9eb 100644
--- a/glibc-testsuite.changes
+++ b/glibc-testsuite.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 19 14:12:59 UTC 2013 - schwab@suse.de
+
+- nscd-server-user.patch: run nscd as user nscd (fate#314673)
+
 -------------------------------------------------------------------
 Thu Sep 12 13:42:23 UTC 2013 - schwab@suse.de
 
diff --git a/glibc-testsuite.spec b/glibc-testsuite.spec
index 3c95b08..5139594 100644
--- a/glibc-testsuite.spec
+++ b/glibc-testsuite.spec
@@ -209,6 +209,8 @@ Patch14:        glibc-bindresvport-blacklist.diff
 Patch15:        glibc-2.3.90-langpackdir.diff
 # PATCH-FEATURE-SLE increase cpusetsize to 4096, needs to be kept for compatibility kukuk@suse.de (XXX: Review)
 Patch18:        glibc-cpusetsize.diff
+# PATCH-FEATURE-SLE Use nscd user for nscd
+Patch19:        nscd-server-user.patch
 
 ### Locale related patches
 # PATCH-FIX-OPENSUSE Add additional locales
@@ -337,6 +339,7 @@ Group:          System/Daemons
 Provides:       glibc:/usr/sbin/nscd
 Requires:       glibc = %{version}
 Obsoletes:      unscd <= 0.48
+Requires(pre):  pwdutils
 %{?systemd_requires}
 
 %description -n nscd
@@ -453,6 +456,7 @@ rm nscd/s-stamp
 %patch14 -p1
 %patch15 -p1
 %patch18 -p1
+%patch19 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -993,6 +997,8 @@ done
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz
 
 %pre -n nscd
+getent group nscd >/dev/null || %{_sbindir}/groupadd -r nscd
+getent passwd nscd >/dev/null || %{_sbindir}/useradd -r -g nscd -c "User for nscd" -s /sbin/nologin -d /var/run/nscd nscd
 %service_add_pre nscd.service
 
 %preun -n nscd
diff --git a/glibc-utils.changes b/glibc-utils.changes
index 9f97669..0bdc9eb 100644
--- a/glibc-utils.changes
+++ b/glibc-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 19 14:12:59 UTC 2013 - schwab@suse.de
+
+- nscd-server-user.patch: run nscd as user nscd (fate#314673)
+
 -------------------------------------------------------------------
 Thu Sep 12 13:42:23 UTC 2013 - schwab@suse.de
 
diff --git a/glibc-utils.spec b/glibc-utils.spec
index 63cfc1c..bf0217a 100644
--- a/glibc-utils.spec
+++ b/glibc-utils.spec
@@ -208,6 +208,8 @@ Patch14:        glibc-bindresvport-blacklist.diff
 Patch15:        glibc-2.3.90-langpackdir.diff
 # PATCH-FEATURE-SLE increase cpusetsize to 4096, needs to be kept for compatibility kukuk@suse.de (XXX: Review)
 Patch18:        glibc-cpusetsize.diff
+# PATCH-FEATURE-SLE Use nscd user for nscd
+Patch19:        nscd-server-user.patch
 
 ### Locale related patches
 # PATCH-FIX-OPENSUSE Add additional locales
@@ -337,6 +339,7 @@ Group:          System/Daemons
 Provides:       glibc:/usr/sbin/nscd
 Requires:       glibc = %{version}
 Obsoletes:      unscd <= 0.48
+Requires(pre):  pwdutils
 %{?systemd_requires}
 
 %description -n nscd
@@ -453,6 +456,7 @@ rm nscd/s-stamp
 %patch14 -p1
 %patch15 -p1
 %patch18 -p1
+%patch19 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -993,6 +997,8 @@ done
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz
 
 %pre -n nscd
+getent group nscd >/dev/null || %{_sbindir}/groupadd -r nscd
+getent passwd nscd >/dev/null || %{_sbindir}/useradd -r -g nscd -c "User for nscd" -s /sbin/nologin -d /var/run/nscd nscd
 %service_add_pre nscd.service
 
 %preun -n nscd
diff --git a/glibc.changes b/glibc.changes
index 9f97669..0bdc9eb 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 19 14:12:59 UTC 2013 - schwab@suse.de
+
+- nscd-server-user.patch: run nscd as user nscd (fate#314673)
+
 -------------------------------------------------------------------
 Thu Sep 12 13:42:23 UTC 2013 - schwab@suse.de
 
diff --git a/glibc.spec b/glibc.spec
index 54dbb02..b3c13fc 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -209,6 +209,8 @@ Patch14:        glibc-bindresvport-blacklist.diff
 Patch15:        glibc-2.3.90-langpackdir.diff
 # PATCH-FEATURE-SLE increase cpusetsize to 4096, needs to be kept for compatibility kukuk@suse.de (XXX: Review)
 Patch18:        glibc-cpusetsize.diff
+# PATCH-FEATURE-SLE Use nscd user for nscd
+Patch19:        nscd-server-user.patch
 
 ### Locale related patches
 # PATCH-FIX-OPENSUSE Add additional locales
@@ -337,6 +339,7 @@ Group:          System/Daemons
 Provides:       glibc:/usr/sbin/nscd
 Requires:       glibc = %{version}
 Obsoletes:      unscd <= 0.48
+Requires(pre):  pwdutils
 %{?systemd_requires}
 
 %description -n nscd
@@ -453,6 +456,7 @@ rm nscd/s-stamp
 %patch14 -p1
 %patch15 -p1
 %patch18 -p1
+%patch19 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -993,6 +997,8 @@ done
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz
 
 %pre -n nscd
+getent group nscd >/dev/null || %{_sbindir}/groupadd -r nscd
+getent passwd nscd >/dev/null || %{_sbindir}/useradd -r -g nscd -c "User for nscd" -s /sbin/nologin -d /var/run/nscd nscd
 %service_add_pre nscd.service
 
 %preun -n nscd
diff --git a/nscd-server-user.patch b/nscd-server-user.patch
new file mode 100644
index 0000000..1e66881
--- /dev/null
+++ b/nscd-server-user.patch
@@ -0,0 +1,13 @@
+Index: glibc-2.18/nscd/nscd.conf
+===================================================================
+--- glibc-2.18.orig/nscd/nscd.conf
++++ glibc-2.18/nscd/nscd.conf
+@@ -33,7 +33,7 @@
+ #	logfile			/var/log/nscd.log
+ #	threads			4
+ #	max-threads		32
+-#	server-user		nobody
++	server-user		nscd
+ #	stat-user		somebody
+ 	debug-level		0
+ #	reload-count		5