diff --git a/doc/man/man1/ldapsearch.1 b/doc/man/man1/ldapsearch.1
index 32f5d8bf57..38e4db98e2 100644
--- a/doc/man/man1/ldapsearch.1
+++ b/doc/man/man1/ldapsearch.1
@@ -195,10 +195,20 @@ base object for the search.  The default is to never dereference aliases.
 Specify the LDAP protocol version to use.
 .TP
 .BI \-l \ timelimit
-wait at most \fItimelimit\fP seconds for a search to complete.
+wait at most \fItimelimit\fP seconds for a search to complete.  A
+timelimit of
+.I 0
+(zero) removes the
+.B ldap.conf
+limit.
 .TP
 .BI \-z \ sizelimit
-retrieve at most \fIsizelimit\fP entries for a search.
+retrieve at most \fIsizelimit\fP entries for a search.  A sizelimit
+of 
+.I 0
+(zero) removes the 
+.B ldap.conf
+limit.
 .SH OUTPUT FORMAT
 If one or more entries are found, each entry is written to standard output
 in the form: