--- a/ChangeLog	Mon May 10 11:03:26 2010 +0200
+++ b/ChangeLog	Mon May 10 12:26:54 2010 +0200
@@ -1,9 +1,32 @@
+This file summarizes the (implementation) changes in a technical view.
+
+The code repository log file provides the changes in full detail.
+
+Have a look at the NEWS file for a summary of the changes in a less
+technical speach and with focus on compatibility.
+
+
+0.3.0	Fri, 07 May 2010 16:50:31 +0200
+	* new maintainer: markus schnalke <meillo@marmaro.de>. See NEWS.
+	* fixed expanding of $prefix for template files. Thanks to Johann
+	  Felix Soden.
+	* fixed delivery with empty or non-existent alias files.
+	  Thanks to Marcos Dione.
+	* fixed empty or only-whitespace connection names.
+	* fixed typos, reported by Reuben Thomas.
+	* corrected man page about /etc/aliases. Thanks to Alexis.
+	* further corrections and improvements in man pages. Man pages will
+	  be maintained in the nroff code directly in future.
+	* removed distribution specific data from repo. It is now separately
+	  available on the website.
+	* changed default online status file to /var/run/masqmail/masqmail-route
+	* removed trigraph warnings
+
 0.2.21	Mon, 07 Nov 2005 14:09:21 -0800
 	* do not use shell when executing sub programs (security fix)
 	* do not accept backtick in email adresses (security fix)
 	* write log files as 'mail' user (security fix)
-	* changed default online status file to /var/run/masqmail/masqmail-route
-	* use /var/run/masqmail for pid files
+	* use /var/run/masqmail/ for pid files
 0.2.20	Mon, 19 May 2003 21:14:06 +0200
 	* fixed a segfaulting bug in spool.c caused by folded headers
 	* regard connect_error_fail when failing for pipes (Debian Bug #186364)

--- a/NEWS	Mon May 10 11:03:26 2010 +0200
+++ b/NEWS	Mon May 10 12:26:54 2010 +0200
@@ -1,6 +1,39 @@
-Here I add changes which may be important for you. See ChangeLog for more
-details and the manual pages for a more complete description
-of added options.
+This files lists changes which may be important for you, especially
+in regard to compatiblity in upgrades.
+
+See ChangeLog file for more details and technical changes that don't
+affect users directly.
+
+The manual pages describe newly added options. Take them for reference.
+
+
+0.3.0
+
+- Hello, I'm meillo, the new maintainer and developer of masqmail. Oku
+handed masqmail over to me, as he wasn't active anymore. I will release
+new code with version numbers starting from 0.3.0 to ease dividing
+between oku's releases and mine.
+
+- This release includes various fixes for problems in 0.2.21, mainly
+based on bugs from Debian.
+
+- Distribution specific data has been excluded from the distribution,
+but is separately available on the website.
+
+- Man pages will not be generated from xml sources in future, but the
+nroff sources will be maintained directly.
+
+- The default online status file is now
+/var/run/masqmail/masqmail-route, as it already was in the Debian
+package.
+
+0.2.21
+
+- Retrospective: Probably, this version was not published in the usual
+way by oku. I (meillo) grabbed it from Debian's package archive. It does
+not introduce new functions but fixes security problems, such as writing
+log files as user `mail'. It also changes the location for pid files;
+they are stored in /var/run/masqmail/ now.
 
 0.2.18
 
@@ -9,8 +42,7 @@
 networks, a connection failure will merely generate a warning by default.
 If you deliver in a local network and use the default local_net route,
 this would generte a failure. You can change this behaviour by setting
-connect_error_fail
-to either true or false in the route configurations.
+'connect_error_fail' to either true or false in the route configurations.
 
 0.2.17
 
@@ -125,7 +157,7 @@
 
 - there is a new option for the main conf: online_gets. Using this option,
 you can retrieve mail with just calling masqmail -go, masqmail will detect
-whether it is online (similar to conect_routes (which is now called
+whether it is online (similar to connect_routes (which is now called
 online_routes)).
 
 0.2.0
@@ -155,7 +187,7 @@
 
 instead of
 
-online_etect=mserver
+online_detect=mserver
 mserver_iface="localhost:222"
 
 0.1.9