diff --git a/doc/ChangeLog b/doc/ChangeLog
index 44f74034..ac7ac5f7 100755
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+Version 2.3.9, released June xxth, 2003
+======================================
+
+- Fixed problem when submitting elog.c itself as an attachment through elog.exe
+- Added option "Use Lock"
+
 Version 2.3.8, released June 4th, 2003
 ======================================
 
diff --git a/doc/config.html b/doc/config.html
index efb9e499..9d848b8b 100755
--- a/doc/config.html
+++ b/doc/config.html
@@ -1201,6 +1201,27 @@ access hidden logbooks, one has to enter the logbook URL directly, or from a boo
 Default is <b>0</b>.
 <p>
 
+<li><b><code>Use Lock = 0|1</code></b>
+</br>
+If this flag is <b>1</b>, a logbook entry is <i>locked</i> when someone edits it (clicking
+the <i>Edit</i> command). A locked message gets displayed with a little red sign indicating
+that the message is currently edited by someone and should not be touched. This can be
+helpful in installations where several people can edit messages. Without locking, the second
+submission of an edited message overwrites the first submission without notice. Although 
+the sign gets displayed, the message can still be edited, but it's the user's response to
+avoid any conflict.<br><br>
+
+Since elog cannot determine if someone keeps a message very long for editing or if only the
+browser got closed, the locking can show up even if the message is not kept for editing any more.
+In that case, the message has to be edited again and submitted, to remove the origial lock.
+Alternatively, the admin user can issue the <i>Unlock</i> command.<br><br>
+
+Note that logbooks accessible from the internet usually get scanned by search engines. This
+can lead to situations where the <i>Edit</i> link of each message is "followed" by a bot,
+resulting in all messages being locked. In those cases locking has to be turned off.<br><br>
+
+Default for "Use Lock" is <b>0</b>.<p>
+
 </ul><p>
 
 <a name="themes"><hr>
diff --git a/doc/wishlist.html b/doc/wishlist.html
index fdc5c6b1..6a99e3c5 100755
--- a/doc/wishlist.html
+++ b/doc/wishlist.html
@@ -48,6 +48,7 @@ starting at the items with the most votes. You can vote for a feature, or sugges
 <tr><td>Implement multi-line attributes<td>1</tr>
 <tr><td>Add more detailed user logging, like $user $date $logbook $ID read/edit/new/delete<td>1</tr>
 <tr><td>More elaborate attribute formatting, see <a href="http://midas.psi.ch/elogdemo/Forum/346">here</a><td>1</tr>
+<tr><td>Derive attribute options from list of entries of another logbook<td>1</tr>
 
 </table></center><p>