diff --git a/ChangeLog b/ChangeLog
index e838076f7..b1efe6a3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-19  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: Describe how to disable registration
+	limitation (EJAB-614)
+
 2008-04-30  Christophe Romain <christophe.romain@process-one.net>
 
 	* src/mod_caps.erl: XEP-0115 patch (EJAB-618)
diff --git a/doc/guide.tex b/doc/guide.tex
index d14fec2a3..7b9f832f7 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -2886,6 +2886,8 @@ This option limits the frequency of registration from a given IP or username.
 So, a user can't register a new account from the same IP address or JID during
 this number of seconds after previous registration.
 Timeout is expressed in seconds, and must be an integer.
+To disable this limitation,
+instead of an integer put a word like: \term{infinity}.
 Default value: 600 seconds.
 
 Examples: