diff --git a/doc/ChangeLog b/doc/ChangeLog
index b190d6f2..5bbdf414 100755
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,9 +1,12 @@
-Version 2.3.6, released April xxx, 2003
-=======================================
+Version 2.3.6, released April 23rd, 2003
+========================================
 
 - Eliminated WEB_BUFFER_SIZE, made memory allocation dynamically
 - Fixed bug that attachments were deleted on reply
 - Added flag "Hidden = 0|1"
+- Added warning if maximum number of attachments reached
+- Fixed bug: Upon login on a logbook with guest access, one got
+  back to the "not logged in" page if username or password was wrong
 
 Version 2.3.5, released April 9th, 2003
 =======================================
diff --git a/doc/index.html b/doc/index.html
index 6b3828d6..3df757b4 100755
--- a/doc/index.html
+++ b/doc/index.html
@@ -31,7 +31,7 @@
 &nbsp;[<a class=nav href="#links">Links</a>]&nbsp;
 *&nbsp;</div>
 <P class=Sub>Home of the <i>Electronic Logbook</i> package by <a href="mailto:Stefan.Ritt@psi.ch">Stefan Ritt</a></P>
-<div class=version>&nbsp; Current version is : 2.3.4 &nbsp;</div>
+<div class=version>&nbsp; Current version is : 2.3.6 &nbsp;</div>
 
 <hr><a name="whatis">
 <div class=section>&nbsp; What is ELOG ? &nbsp;</div>
diff --git a/eloglang.german b/eloglang.german
index 75b33b5c..d41e77ea 100755
--- a/eloglang.german
+++ b/eloglang.german
@@ -269,4 +269,5 @@ Password recovery for ELOG %s = Kennwort-Wiederherstellung f
 Host = Computer
 Your ELOG account has been activated = Ihr ELOG Konto wurde aktiviert
 Activate = Aktivieren
-Maximum number of attachments reached = Maximale Anzahl von Anhängen erreicht
\ No newline at end of file
+Maximum number of attachments reached = Maximale Anzahl von Anhängen erreicht
+Invalid user name <i>"%s"</i> = Falscher Benutzer-Name <i>"%s"</i>
diff --git a/src/elogd.c b/src/elogd.c
index 827a5881..9f4cb777 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -6,6 +6,9 @@
   Contents:     Web server program for Electronic Logbook ELOG
 
   $Log$
+  Revision 1.92  2003/04/23 10:40:21  midas
+  Version 2.3.6
+
   Revision 1.91  2003/04/23 09:59:46  midas
   Fixed bug that administrator could not change passwords of other users
 
@@ -794,7 +797,7 @@
 \********************************************************************/
 
 /* Version of ELOG */
-#define VERSION "2.3.5"
+#define VERSION "2.3.6"
 
 #include <stdio.h>
 #include <sys/types.h>