Update

@@ -6,7 +6,7 @@
 	* mailbox/property.c: Likewise
 	* mailbox/Makefile.am: Merge DEFS and AM_CPPFLAGS
 	* mailbox/mailer.c (mu_mailer_send_message): Set envelope from
-	address depending on the underlying mailer type.
+	address according to the underlying mailer type.
 	* mailbox/smtp.c (smtp_open,smtp_send_message): On invalid
 	arguments, return EINVAL instead of spitting out assertion.
 	(smtp_send_message): Null from address is an error.

@@ -4,7 +4,7 @@ or CVS version of the package. See end of file for copying conditions.
 
 * Introduction
 
-    This is a *pre-release* version, and not ready for production use
+This is a *pre-release* version, and not ready for production use
 yet. If you are taking source from CVS, you will need to have libtool,
 automake, and autoconf installed to help contribute. See the chapter
 `Building' for the detailed instructions. The script autogen.sh is
@@ -13,7 +13,7 @@ run autogen.sh, there should be a file 'INSTALL' with (generic)
 installation instructions. Package-specific installation instructions
 are set forth in the file README.
 
-    Please, note that the accompanying documentation may be inaccurate
+Please, note that the accompanying documentation may be inaccurate
 or incomplete. The ChangeLog file is the authoritative documentation of
 all recent changes.
 
@@ -28,12 +28,12 @@ To checkout the source tree from CVS issue the following command:
 
  cvs -d :pserver:anoncvs@cvs.savannah.gnu.org:/cvsroot/mailutils checkout mailutils
 
-    This will give you read-only access.  If you think you need write access,
+This will give you read-only access.  If you think you need write access,
 contact the mailing list.
 
 * Building
 
-    In order to build this you will first need to have right versions
+In order to build this you will first need to have right versions
 of autotools and some auxiliary GNU programs. At the time of this
 writing these are: 
 
@@ -45,14 +45,19 @@ writing these are:
   gettext   0.14.1
   gawk      3.1.3
 
-    You will also need bison (or yacc) and flex. The grammar sources
+You will also need bison (or yacc) and flex. The grammar sources
 were written so that any version of yacc or bison should be able to 
 handle them, however using recent bison is anyway recommended. The lex
 sources could theoretically be compiled with AT&T lex. I have not
 tested this, however, so using flex is higly recommended. I use flex
 2.5.4. 
   
-    To prepare the package for building run autogen.sh. Then run
+To prepare the package for building run autogen.sh. This may spit out
+several warnings like:
+
+pop3d_OBJECTS:.$(OBJEXT: non-POSIX variable name
+
+Ignore them, these are due to the bug in automake. Then run
 ./configure with the desired options (See INSTALL and README for the
 detailed instructions). Finally, run make. Notice that the first make
 of the package should be made in the source directory. Subsequent
@@ -60,15 +65,15 @@ makes can use build directory different from the source one.
 
 * Debugging
 
-    To enable additional debugging information, configure the package
+To enable additional debugging information, configure the package
 with --enable-debug option.
 
-    Unless you compile mailutils statically, you will need to run
+Unless you compile mailutils statically, you will need to run
 following command to debug any utility: 
 
   libtool --mode execute gdb UTILITY-NAME
 
-    Sometimes it is impossible or inconvenient to start a utility from
+Sometimes it is impossible or inconvenient to start a utility from
 the debugger. In this case, use --HANG option, which is supported by
 any of the mailutils programs. The option instructs the program to
 sleep for a given number of seconds (3600 by default) right after
@@ -89,7 +94,7 @@ Now set your breakpoints and proceed as usual.
 
 * Importing gnulib files
 
-    Mailutils imports several source files from gnulib. These go
+Mailutils imports several source files from gnulib. These go
 mainly to the conventional library libmuaux (directory lib/), but
 several of them are incorporated into the main library libmailutils
 (directory mailbox/). The imported sources are kept in the CVS
@@ -101,7 +106,7 @@ the mailutils tree and run `gnulib-sync' script:
   $ cd mailutils
   $ scripts/gnulib-sync $HOME/src/gnulib
 
-    The script takes a single argument: name of the directory with the
+The script takes a single argument: the name of the directory with the
 copy of gnulib source tree (see http://savannah.gnu.org/projects/gnulib
 for information on how to obtain gnulib sources). After incorporating
 the files, gnulib-sync leaves in the current directory two files named
@@ -110,7 +115,7 @@ an entry to be prepended to ChangeLog, the file gnulib.cvs is a shell
 script with the commands necessary to incorporate all the changes into
 CVS. 
 
-    If you need to add more gnulib modules to mailutils, add their
+If you need to add more gnulib modules to mailutils, add their
 names to gnulib.modules file, following the instructions in its
 heading comment. Please avoid placing modules in :mailutils section, as
 this may lead to unwanted name clashes when linking user programs with
@@ -118,7 +123,7 @@ libmailutils.
 
 * Copyright information:
 
-Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the