diff --git a/glibc.changes b/glibc.changes
index 2edd020..2836397 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug 22 13:12:18 UTC 2011 - aj@suse.de
+
+- Update AppArmor profile of nscd [bnc#647718]
+
 -------------------------------------------------------------------
 Fri Aug 19 13:26:11 UTC 2011 - aj@suse.de
 
diff --git a/usr.sbin.nscd b/usr.sbin.nscd
index 3733977..4241743 100644
--- a/usr.sbin.nscd
+++ b/usr.sbin.nscd
@@ -1,8 +1,7 @@
-# Last Modified: Wed Aug 15 10:55:46 2007
-# $Id: usr.sbin.nscd 1313 2008-11-05 12:03:29Z jrjohansen $
 # ------------------------------------------------------------------
 #
 #    Copyright (C) 2002-2005 Novell/SUSE
+#    Copyright (C) 2009-2010 Canonical Ltd.
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of version 2 of the GNU General Public
@@ -27,17 +26,20 @@
   /tmp/.winbindd/pipe rw,
   /usr/sbin/nscd rmix,
   /var/lib/samba/winbindd_privileged/pipe rw,
-  /var/run/.nscd_socket wl,
-  /var/run/avahi-daemon/socket w,
-  /var/run/nscd/ r,
-  /var/run/nscd/db* wl,
-  /var/run/nscd/socket wl,
-  /var/run/nscd/{passwd,group,services,hosts} rw,
-  /var/run/{nscd/,}nscd.pid rwl,
+  /{,var/}run/.nscd_socket wl,
+  /{,var/}run/avahi-daemon/socket w,
+  /{,var/}run/nscd/ rw,
+  /{,var/}run/nscd/db* wl,
+  /{,var/}run/nscd/socket wl,
+  /var/{cache,run}/nscd/{passwd,group,services,hosts} rw,
+  /{,var/}run/{nscd/,}nscd.pid rwl,
   /var/log/nscd.log rw,
   @{PROC}/[0-9]*/fd/ r,
   @{PROC}/[0-9]*/fd/* r,
   @{PROC}/[0-9]*/maps r,
   @{PROC}/[0-9]*/mounts r,
   @{PROC}/filesystems r,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/usr.sbin.nscd>
 }