diff --git a/Makefile.am b/Makefile.am
line changes: +43/-55
index ffb8523..5401762
--- a/Makefile.am
+++ b/Makefile.am

@@ -1,41 +1,52 @@
-## Process this file with automake to produce Makefile.in (in this,
-## and all subdirectories).
-## 
-## Makefile for the top-level directory of GNU hello.
-## Copyright (C) 1997, 1998, 2005, 2006 Free Software Foundation, Inc.
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software Foundation,
-## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Find gnulib headers
+# Process this file with automake to produce Makefile.in (in this,
+# and all subdirectories).
+# 
+# Makefile for the top-level directory of GNU hello.
+# Copyright (C) 1997, 1998, 2005, 2006 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Find gnulib headers.
 ACLOCAL_AMFLAGS = -I gnulib/m4
 
-MAINT_CHARSET = latin1
-
-# previous version
-ke_PRE = @ke_PRE@
-
-DISTCLEANFILES = stamp-h
-EXTRA_DIST = BUGS ChangeLog.O
+# Additional files to distribute.
+EXTRA_DIST = ChangeLog.O
 
+# Subdirectories to descend into.
 SUBDIRS = contrib gnulib/lib po src doc man tests
 
-# To produce a diff against the previous version, untar this version
-# and the previous version in the same directory and run `make diff'.
-# Only the maintainer should do this.
+# `make diff' produces a diff against the previous version, given both
+# .tar.gz's in the current directory.  This should only be done when an
+# official release is made (and only if you care to provide diffs).
+# 
+hello_pre = 2.1.1
+#
+diff: diffcheck
+	echo -e "\
+To apply these patches, cd to the main directory of the package\n\
+and then use \`patch -p1 < hello-XXX.diff'.\n\
+Before building the program, run \`autogen.sh'.\n" > \
+	    $(PACKAGE)-$(hello_pre)-$(VERSION).diff
+	-diff -rc2P --exclude=configure --exclude=config.h.in --exclude=*.info \
+	    --exclude=*.gmo --exclude=aclocal.m4 \
+	    $(PACKAGE)-$(hello_pre) $(PACKAGE)-$(VERSION) >> \
+	    $(PACKAGE)-$(hello_pre)-$(VERSION).diff
+	gzip --force --best $(PACKAGE)-$(hello_pre)-$(VERSION).diff
+
 diffcheck:
-	for d in $(PACKAGE)-$(ke_PRE) $(PACKAGE)-$(VERSION) ; do \
+	for d in $(PACKAGE)-$(hello_pre) $(PACKAGE)-$(VERSION) ; do \
 	    if test ! -d $$d ; then \
 	        if test -r $$d.tar.gz ; then \
 	            tar -zxf $$d.tar.gz ; \

@@ -45,26 +56,3 @@ diffcheck:
                 fi ; \
 	    fi ; \
 	done
-
-diff: diffcheck
-	echo -e "\
-To apply these patches, cd to the main directory of the package\n\
-and then use \`patch -p1 < hello-XXX.diff'.\n\
-Before building the programm run \`autoconf' and \`autoheader' to rebuild\n\
-\`configure' and \`config.h.in'.\n\n" > \
-	    $(PACKAGE)-$(ke_PRE)-$(VERSION).diff
-	-diff -rc2P --exclude=configure --exclude=config.h.in --exclude=*.info \
-	    --exclude=*.gmo --exclude=aclocal.m4 \
-	    $(PACKAGE)-$(ke_PRE) $(PACKAGE)-$(VERSION) >> \
-	    $(PACKAGE)-$(ke_PRE)-$(VERSION).diff
-	gzip --force --best $(PACKAGE)-$(ke_PRE)-$(VERSION).diff
-
-# 	gzip < po/hello.pot \
-# 	  | uuencode -m hello-$(VERSION).pot.gz \
-# 	  | mail -s "TP-Robot hello-$(VERSION).pot" translation@iro.umontreal.ca
-pot-to-trans:
-	echo "http://www.gnu.franken.de/ke/hello/hello-$(VERSION).tar.bz2" \
-	  | mail -s "TP-Robot hello-$(VERSION).pot" \
-	    translation@iro.umontreal.ca
-
-## Makefile.am ends here

diff --git a/NEWS b/NEWS
line changes: +3/-3
index 0679dc8..423fa57
--- a/NEWS
+++ b/NEWS

@@ -2,16 +2,16 @@ This NEWS file records noteworthy changes, very tersely.
 See the manual for detailed information.
 
   Copyright (C) 1992, 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2005 Free Software Foundation, Inc.  
+  2002, 2003, 2005, 2006 Free Software Foundation, Inc.  
 
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
   notice and this notice are preserved.
 
-
+* Remove creeping non-feature of reading mail; simplify code accordingly.
 * Distribution:
   . Use gnulib for shared source files, such as texinfo.tex and getopt.c.
-  . automake 1.9.5, autoconf 2.59, gettext 0.14.5.
+  . update for automake 1.9.5, autoconf 2.60, gettext 0.14.6.
 
 
 Version 2.1.2 (20 July 2002)

diff --git a/configure.ac b/configure.ac
line changes: +2/-2
index 8c18885..b6f22d1
--- a/configure.ac
+++ b/configure.ac

@@ -8,11 +8,11 @@ dnl This program is distributed in the hope that it will be useful, but
 dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-AC_INIT([GNU Hello], [2.9.90], [bug-hello@gnu.org])
+AC_INIT([GNU Hello], [2.1.90], [bug-hello@gnu.org])
 
 dnl Must come before AM_INIT_AUTOMAKE.
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([check-news dist-bzip2 readme-alpha])
+AM_INIT_AUTOMAKE([dist-bzip2 readme-alpha])
 
 # Minimum Autoconf version required.
 AC_PREREQ(2.59)

diff --git a/doc/hello.texi b/doc/hello.texi
line changes: +8/-1
index b938c6f..5c85c5f
--- a/doc/hello.texi
+++ b/doc/hello.texi

@@ -79,6 +79,9 @@ would otherwise be unavailable to them.  Because it is protected by
 the GNU General Public License, users are free (in perpetuity) to
 share and change it.
 
+For the latest updates and other information, please visit the GNU
+Hello home page at @url{http://www.gnu.org/software/hello}.
+
 @cindex joke, not
 Not to spoil the joke, but of course the practical purpose of GNU
 Hello is to serve as a minimal example of a GNU package.  So, although

@@ -96,7 +99,7 @@ GNU Maintainers}).  These are the basic documents which all GNU
 packages should adhere to.
 
 The Hello package also implements recommended development practices
-not embodied in the standards, using other GNU packages.
+not embodied in the standards, using other GNU packages and features:
 
 @itemize @bullet
 

@@ -140,6 +143,10 @@ HTML, PDF, DVI, plain text, XML, and other formats.
 
 @end itemize
 
+GNU Hello is implemented in C.  GNU Gettext contains ``hello world''
+examples in a variety of other programming languages; see the Gettext
+home page at @url{http://www.gnu.org/software/gettext}.
+
 @cindex authors
 @cindex Haertel, Mike
 @cindex MacKenzie, David

diff --git a/gnulib/lib/Makefile b/gnulib/lib/Makefile
line changes: +1/-1
index c2049ac..2a2d1b7
--- a/gnulib/lib/Makefile
+++ b/gnulib/lib/Makefile

@@ -23,7 +23,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --aux-dir=build-aux --macro-prefix=gl gettext
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=build-aux --macro-prefix=gl gettext
 
 
 srcdir = .

diff --git a/gnulib/lib/Makefile.in b/gnulib/lib/Makefile.in
line changes: +1/-1
index 8eca2a2..8d80342
--- a/gnulib/lib/Makefile.in
+++ b/gnulib/lib/Makefile.in

@@ -23,7 +23,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --aux-dir=build-aux --macro-prefix=gl gettext
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/lib --m4-base=gnulib/m4 --doc-base=doc --aux-dir=build-aux --macro-prefix=gl gettext
 
 
 srcdir = @srcdir@

diff --git a/src/hello.c b/src/hello.c
line changes: +9/-10
index fc4d11d..82590a0
--- a/src/hello.c
+++ b/src/hello.c

@@ -1,4 +1,5 @@
 /* hello.c -- print a greeting message and exit.
+
    Copyright (C) 1992, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
    2005, 2006 Free Software Foundation, Inc.
 

@@ -37,7 +38,7 @@ main (argc, argv)
      char *argv[];
 {
   int optc;
-  int h = 0, v = 0, t = 0, n = 0, lose = 0, z = 0;
+  int h = 0, v = 0, t = 0, n = 0, lose = 0;
   char *greeting = NULL;
 
   progname = argv[0];

@@ -77,9 +78,7 @@ main (argc, argv)
         break;
       }
   
-  if (optind == argc - 1 && strcmp (argv[optind], "sailor") == 0)
-    z = 1;
-  else if (lose || optind < argc)
+  if (lose || optind < argc)
     {
       /* Print error message and exit.  */
       if (optind < argc)

@@ -89,11 +88,13 @@ main (argc, argv)
       exit (1);
     }
 
-  /* `help' should come first.  If `help' is requested, ignore the other
-     options. */
+  /* If `help' or `version' is requested, ignore the other options. */
   if (h)
     {
-      /* Print help info and exit.  */
+      /* Print help info and exit.  This long message is split into
+         several pieces to help translators be able to align different
+         blocks and identify the various pieces.  */
+         
       /* TRANSLATORS: --help output 1
          no-wrap */
       fputs (_("\

@@ -102,7 +103,7 @@ GNU hello, THE greeting printing program.\n"), stdout);
       /* TRANSLATORS: --help output 2
          no-wrap */
       printf (_("\
-Usage: %s [OPTION]\n"), progname);
+Usage: %s [OPTION]...\n"), progname);
 
       printf ("\n");
       /* TRANSLATORS: --help output 3 : options 1/2

@@ -145,8 +146,6 @@ For more information about these matters, see the file named COPYING.\n"),
               "2006", PACKAGE);
       exit (0);
     }
-  else if (z)
-    puts (_("Nothing happens here."));
 
   else
     /* Print greeting message and exit. */