diff --git a/man8/nscd.8 b/man8/nscd.8
index ecbd9ba91..02eaa6079 100644
--- a/man8/nscd.8
+++ b/man8/nscd.8
@@ -17,7 +17,10 @@
 .\" write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 .\" Boston, MA 02111-1307, USA.
 .\"
-.TH NSCD 8 1999-10-01 "GNU" "Linux Programmer's Manual"
+.\" 2008-12-05 Petr Baudis <pasky@suse.cz>
+.\"	Rewrite the NOTES section to reflect modern reality
+.\"
+.TH NSCD 8 2008-12-05 "GNU" "Linux Programmer's Manual"
 .SH NAME
 /usr/sbin/nscd \- name service cache daemon
 .SH DESCRIPTION
@@ -55,16 +58,28 @@ calls remain uncached as a result.
 .B "\-\-help"
 will give you a list with all options and what they do.
 .SH NOTES
-Nscd doesn't know anything about the underlying protocols for a
-service.
-This also means, that if you change
-.I /etc/resolv.conf
-for DNS queries, nscd will continue to use the old one if you have
-configured
-.I /etc/nsswitch.conf
-to use DNS for host lookups.
-In such a case, you need to restart
-nscd.
+The daemon will try to watch for changes in configuration files
+appropriate for each database (e.g.
+.I /etc/passwd
+for the
+.I passwd
+database or
+.IR "/etc/hosts " and " /etc/resolv.conf"
+for the
+.I hosts
+database), and flush the cache when these are changed.
+However, this will happen only after a short delay (unless the
+.BR inotify (7)
+mechanism is available and glibc 2.9 or later is available),
+and this auto-detection does not cover configuration files
+required by non-standard NSS modules, if any are specified in
+.IR /etc/nsswitch.conf .
+In that case, you need to run the following command
+after changing the configuration file of the database so that
+.B nscd
+invalidates its cache:
+
+    $ \fBnscd -i \fI<database>\fP
 .SH "SEE ALSO"
 .BR nscd.conf (5),
 .BR nsswitch.conf (5)