diff --git a/ChangeLog b/ChangeLog
index 2e99dbb24402d35066b419ddcece9d9c843d30ec..aa5c9a0b86406a3a5dfda3b2ea1dd95e3de3054d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,27 @@
+2002-08-10  Per Cederqvist  <ceder@ceder.dyndns.org>
+
+	Fix membership visibility for get-unread-confs. (Bug 597).
+	* src/server/membership.c (enum memb_visibility): New enum.
+	(check_unread): New static function.
+	(membership_visible): New static function, that fully implements
+	the membership visibility rules that were documented 2002-08-07.
+	(get_unread_confs): Use membership_visible to simplify the code
+	and use the correct membership visibility rules.  Various code
+	cleanup.
+	* src/server/testsuite/lyskomd.0/bug-37-2.exp: get-unread-confs is
+	now better.  Bug 597 fixed.
+	* src/server/testsuite/lyskomd.0/bug-37.exp: get-unread-confs now
+	fails in a different, and better, way for secret persons.
+	* src/server/testsuite/lyskomd.0/27.exp: query-read-texts-old, 
+	query-read-texts and get-unread-confs should not censor the secret
+	conference, since the viewer is supervisor of the member.
+
 2002-08-08  Per Cederqvist  <ceder@ceder.dyndns.org>
 
+	Comment added.
+	* src/server/membership.c (sub_member): Added comments for bug
+	612.
+
 	Code cleanup: remove global define of SMALLOC_MAGIC_ALLOC and
 	SMALLOC_MAGIC_FREE. (Bug 562).
 	* src/server/ram-smalloc.c (SMALLOC_MAGIC_ALLOC): Moved here from