diff --git a/ChangeLog b/ChangeLog
index 7ab4c4f76..49c6cb519 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-24  Badlop  <badlop@process-one.net>
+
+	* doc/guide.tex: Document room options allow_visitor_nickchange
+	and allow_visitor_status (EJAB-624)
+	* doc/guide.html: Likewise
+
 2008-07-23  Geoff Cant  <geoff.cant@process-one.net>
 
 	* src/mod_muc/mod_muc_room.erl: new room options,
diff --git a/doc/guide.html b/doc/guide.html
index 02ea12132..c67f12103 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -2028,6 +2028,12 @@ The available room options and the default values are:
 </DD><DT CLASS="dt-description"><B><TT>{allow_private_messages, true}</TT></B></DT><DD CLASS="dd-description"> Occupants can send private messages to other occupants.
 </DD><DT CLASS="dt-description"><B><TT>{allow_query_users, true}</TT></B></DT><DD CLASS="dd-description"> Occupants can send IQ queries to other occupants.
 </DD><DT CLASS="dt-description"><B><TT>{allow_user_invites, false}</TT></B></DT><DD CLASS="dd-description"> Allow occupants to send invitations.
+</DD><DT CLASS="dt-description"><B><TT>{allow_visitor_nickchange, true}</TT></B></DT><DD CLASS="dd-description"> Allow visitors to
+change nickname.
+</DD><DT CLASS="dt-description"><B><TT>{allow_visitor_status, true}</TT></B></DT><DD CLASS="dd-description"> Allow visitors to send
+status text in presence updates. If disallowed, the <TT>status</TT>
+text is stripped before broadcasting the presence update to all
+the room occupants.
 </DD><DT CLASS="dt-description"><B><TT>{anonymous, true}</TT></B></DT><DD CLASS="dd-description"> Occupants are allowed to see the real JIDs of other occupants.
 </DD><DT CLASS="dt-description"><B><TT>{logging, false}</TT></B></DT><DD CLASS="dd-description"> The public messages are logged using <TT>mod_muc_log</TT>.
 </DD><DT CLASS="dt-description"><B><TT>{max_users, 200}</TT></B></DT><DD CLASS="dd-description"> Maximum number of occupants in the room.
diff --git a/doc/guide.tex b/doc/guide.tex
index 17cfbeb80..355a84a37 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -2639,6 +2639,12 @@ Module options:
   \titem{\{allow\_private\_messages, true\}} Occupants can send private messages to other occupants.
   \titem{\{allow\_query\_users, true\}} Occupants can send IQ queries to other occupants.
   \titem{\{allow\_user\_invites, false\}} Allow occupants to send invitations.
+  \titem{\{allow\_visitor\_nickchange, true\}} Allow visitors to
+  change nickname.
+  \titem{\{allow\_visitor\_status, true\}} Allow visitors to send
+  status text in presence updates.  If disallowed, the \term{status}
+  text is stripped before broadcasting the presence update to all
+  the room occupants.
   \titem{\{anonymous, true\}} Occupants are allowed to see the real JIDs of other occupants.
   \titem{\{logging, false\}} The public messages are logged using \term{mod\_muc\_log}.
   \titem{\{max\_users, 200\}} Maximum number of occupants in the room.