diff --git a/doc/ChangeLog b/doc/ChangeLog
index 63b736c..97dddec 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-31 Hasso Tepper <hasso at quagga.net>
+
+	* zebra.8: Document -s/--nl-bufsize command line switch.
+
 2004-08-27 Hasso Tepper <hasso at quagga.net>
 
 	* Update vtysh man page to reflect changes in shell.
diff --git a/doc/zebra.8 b/doc/zebra.8
index 8f83015..25cbb36 100644
--- a/doc/zebra.8
+++ b/doc/zebra.8
@@ -71,6 +71,18 @@
 \fB\-r\fR, \fB\-\-retain\fR 
 When the program terminates, retain routes added by \fBzebra\fR.
 .TP
+\fB\-s\fR, \fB\-\-nl-bufsize \fR\fInetlink-buffer-size\fR
+Set netlink receive buffer size. There are cases where zebra daemon can't
+handle flood of netlink messages from kernel. If you ever see "recvmsg overrun"
+messages in zebra log, you are in trouble.
+
+Solution is to increase receive buffer of netlink socket. Note that kernel
+doesn't allow to increase it over maximum value defined in
+\fI/proc/sys/net/core/rmem_max\fR. If you want to do it, you have to increase
+maximum before starting zebra.
+
+Note that this affects Linux only.
+.TP
 \fB\-v\fR, \fB\-\-version\fR
 Print the version and exit.
 .SH FILES