--- a/ChangeLog	Sun May 30 00:30:20 2004 +1000
+++ b/ChangeLog	Sun May 30 00:40:21 2004 +1000
@@ -1,4 +1,6 @@
 0.5.2
+ o footer and customheaders are now accessed from listdir/control/ where
+   they belong
  o Discard mails that doesn't have one and only one From: address. Discard
    here means moving them to queue/discard
  o Make sure we retrieve info from all headers matching the token we want

--- a/README	Sun May 30 00:30:20 2004 +1000
+++ b/README	Sun May 30 00:40:21 2004 +1000
@@ -1,4 +1,4 @@
-README mlmmj-0.5.1					May 19th 2004
+README mlmmj-0.5.2					May 29th 2004
 
 This is an attempt at implementing a mailing list manager with the same
 functionality as the brilliant ezmlm, but with a decent license and mail server
@@ -33,6 +33,7 @@
 
    /var/spool/mlmmj/mlmmj-test/incoming
    /var/spool/mlmmj/mlmmj-test/queue
+   /var/spool/mlmmj/mlmmj-test/queue/discarded
    /var/spool/mlmmj/mlmmj-test/archive
    /var/spool/mlmmj/mlmmj-test/text
    /var/spool/mlmmj/mlmmj-test/subconf
@@ -71,8 +72,8 @@
    user that writes mail.
 
 5) If you want custom headers like X-Mailinglist, Reply-To: etc. just add a
-   file called 'customheaders' in the list directory like this:
-   $ cat /var/spool/mlmmj/mlmmj-test/customheaders
+   file called 'customheaders' in the list control/ directory like this:
+   $ cat /var/spool/mlmmj/mlmmj-test/control/customheaders
    X-Mailinglist: mlmmj-test
    Reply-To: mlmmj-test@domain.tld
 
@@ -81,7 +82,7 @@
    To unsubscribe send a mail to coollist+unsubscribe@lists.domain.net
 
    Just add what you want to a file named "footer" in the same dir as
-   "customheader".
+   "customheader" (listdir/control/).
 
 7) For having a moderated list, simply create a file called 'moderated' in the
    control/ directory. Moderators are added to a file called 'moderators' in

--- a/UPGRADE	Sun May 30 00:30:20 2004 +1000
+++ b/UPGRADE	Sun May 30 00:40:21 2004 +1000
@@ -1,3 +1,14 @@
+This applies to everyone using mlmmj > 0.5.1:
+---------------------------------------------
+
+ Following directories have to be created:
+
+  · listdir/requeue/
+  · listdir/queue/discarded/
+
+ The footer and customheaders file are now to be placed in the control/
+ directory where they belong, so they should be moved there from listdir.
+
 This applies to everyone using mlmmj > 0.5.0:
 ---------------------------------------------
 
@@ -12,9 +23,3 @@
 
  A quick and dirty hack would be to simply move listdir/subscribers into
  subscribers.d/. This could lead to double subscriptions, so use with caution!
-
-This applies to everyone using mlmmj > 0.5.1:
----------------------------------------------
-
- listdir/requeue/ directory have to be created
-