* NEWS, configure.ac: Bump version to 1.9b.
diff --git a/ChangeLog b/ChangeLog
index c51853f..69e3836 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-08-20  Alexandre Duret-Lutz  <adl@gnu.org>
 
+	* NEWS, configure.ac: Bump version to 1.9b.
+
 	* Makefile.am (maintainer-check): Check for mkdir_p in automake.in
 	too.
 	* automake.in (require_build_directory): Use MKDIR_P, not mkdir_p.
diff --git a/Makefile.in b/Makefile.in
index bda8784..1edccec 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9a from Makefile.am.
+# Makefile.in generated by automake 1.9b from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -806,7 +806,8 @@
 	  echo 'Do not use egrep or fgrep in the above files, they are not portable.' 1>&2; \
 	  exit 1; \
 	fi
-	@if grep 'mkdir_p' $(srcdir)/lib/am/*.am $(srcdir)/tests/*.test; then \
+	@if grep 'mkdir_p' $(srcdir)/automake.in \
+	      $(srcdir)/lib/am/*.am $(srcdir)/tests/*.test; then \
 	  echo 'Do not use mkdir_p in the above files, use MKDIR_P.' 1>&2; \
 	  exit 1; \
 	fi
@@ -826,7 +827,7 @@
 	  echo 'Do not use tabs in the manual.' 1>&2; \
 	  exit 1; \
 	fi
-	@if grep -E '([^@]|^)@([	 ]|$$)' $(srcdir)/doc/automake.texi; \
+	@if grep -E '([^@]|^)@([	 ][^@]|$$)' $(srcdir)/doc/automake.texi; \
 	then \
 	  echo 'Unescaped @.' 1>&2; \
 	  exit 1; \
diff --git a/NEWS b/NEWS
index bd911c1..66413cf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,24 +1,18 @@
-New in 1.9a:
+New in 1.9b:
 
-  - Autoconf 2.60 is required.
+* Version requirements:
+
+  - Autoconf 2.60 or greater is required.
 
   - Perl 5.6 or greater is required.
 
-  - The new AC_REQUIRE_AUX_FILE Autoconf macro is supported.
-
-  - The rebuild rules for distributed Yacc and Lex output will avoid
-    overwriting existing files if AM_MAINTAINER_MODE and maintainer-mode
-    is not enabled.
-
-  - Preprocessed assembler (*.S) compilation now honnors CPPFLAGS,
-    AM_CPPFLAGS and per-target _CPPFLAGS, and supports dependency
-    tracking, unlike non-preprocessed assembler (*.s).
-
-  - Libtool generic flags (those that go before the --mode=MODE option)
-    can be specified using AM_LIBTOOLFLAGS and target_LIBTOOLFLAGS.
+* Changes to aclocal:
 
   - aclocal now also supports -Wmumble and -Wno-mumble options.
 
+  - `dirlist' entries (for the aclocal search path) may use shell
+    wildcards such as `*', `?', or `[...]'.
+
   - aclocal supports an --install option, that will cause system-wide
     third-party macros to be installed in the local directory
     specified with the first -I flag.  This option also uses #serial
@@ -27,6 +21,56 @@
     The new aclocal options --dry-run and --diff help to review changes
     before they are installed.
 
+  - aclocal now outputs an autoconf version check in aclocal.m4 in
+    projects using automake.
+
+    For a few years, automake and aclocal have been calling autoconf
+    (or its underlying engine autom4te) to accurately retrieve the
+    data they need from configure.ac and its siblings.  Doing so can
+    only work if all autotools use the same version of autoconf.  For
+    instance a Makefile.in generated by automake for one version of
+    autoconf may stop working if configure is regenerated with another
+    version of autoconf, and vice versa.
+
+    This new version check ensures that the whole build system has
+    been generated using the same autoconf version.
+
+* Support for new Autoconf macros:
+
+  - The new AC_REQUIRE_AUX_FILE Autoconf macro is supported.
+
+  - If `subdir-objects' is set, and AC_CONFIG_LIBOBJ_DIR is specified,
+    $(LIBOBJS), $(LTLIBOBJS), $(ALLOCA), and $(LTALLOCA) can be used
+    in different directories.
+
+* Change to Libtool support:
+
+  - Libtool generic flags (those that go before the --mode=MODE option)
+    can be specified using AM_LIBTOOLFLAGS and target_LIBTOOLFLAGS.
+
+* Yacc and Lex changes:
+
+  - The rebuild rules for distributed Yacc and Lex output will avoid
+    overwriting existing files if AM_MAINTAINER_MODE and maintainer-mode
+    is not enabled.
+
+  - ylwrap is now always used for lex and yacc source files,
+    regardless of whether there is more than one source per-directory.
+
+* Languages changes:
+
+  - Preprocessed assembler (*.S) compilation now honnors CPPFLAGS,
+    AM_CPPFLAGS and per-target _CPPFLAGS, and supports dependency
+    tracking, unlike non-preprocessed assembler (*.s).
+
+  - Improved support for Objective C:
+    - Autoconf's new AC_PROG_OBJC will enable automatic dependency tracking.
+    - A new section of the manual documents the support.
+
+  - New support for Unified Parallel C:
+    - AM_PROG_UPC looks for a UPC compiler.
+    - A new section of the manual documents the support.
+
   - Per-target flags are now correctly handled in link rules.
 
     For instance maude_CFLAGS correctly overrides AM_CFLAGS; likewise
@@ -58,6 +102,8 @@
     per-target variables, and the way *_LDFLAGS variables were
     considered internally.
 
+* New installation targets:
+
   - New targets mandated by GNU Coding Standards:
       install-dvi
       install-html
@@ -75,6 +121,8 @@
     flavors, including optional formats such as dvi, ps, or info even
     when `no-installinfo' is used.)
 
+* Miscellaneous changes:
+
   - Automake no longer complains if input files for AC_CONFIG_FILES
     are specified using shell variables.
 
@@ -85,10 +133,6 @@
     be able to output rules anyway.
     (See the Automake documentation for AC_CONFIG_FILES.)
 
-  - If `subdir-objects' is set, and AC_CONFIG_LIBOBJ_DIR is specified,
-    $(LIBOBJS), $(LTLIBOBJS), $(ALLOCA), and $(LTALLOCA) can be used
-    in different directories.
-
   - $(EXEEXT) is automatically appended to filenames of TESTS
     that have been declared as programs in the same Makefile.
     This is mostly useful when some check_PROGRAMS are listed in TESTS.
@@ -98,35 +142,6 @@
     or $(GNU Make functions) unless you switch to `foreign' strictness or
     use `-Wno-portability'.
 
-  - Improved support for Objective C:
-    - Autoconf's new AC_PROG_OBJC will enable automatic dependency tracking.
-    - A new section of the manual documents the support.
-
-  - `dirlist' entries (for the aclocal search path) may use shell wildcards
-    such as `*', `?', or `[...]'.
-
-  - aclocal now outputs an autoconf version check in aclocal.m4 in
-    projects using automake.
-
-    For a few years, automake and aclocal have been calling autoconf
-    (or its underlying engine autom4te) to accurately retrieve the
-    data they need from configure.ac and its siblings.  Doing so can
-    only work if all autotools use the same version of autoconf.  For
-    instance a Makefile.in generated by automake for one version of
-    autoconf may stop working if configure is regenerated with another
-    version of autoconf, and vice versa.
-
-    This new version check ensures that the whole build system has
-    been generated using the same autoconf version.
-
-  - New support for Unified Parallel C:
-    - AM_PROG_UPC looks for a UPC compiler.
-    - A new section of the manual documents the support.
-
-  - Automake installs an "Hello World!" example package in $(docdir).
-    This example is used thorough the new "Autotools Introduction"
-    chapter of the manual.
-
   - Automake now uses AC_PROG_MKDIR_P (new in Autoconf 2.60), and uses
     $(MKDIR_P) instead of $(mkdir_p) to create directories.  The
     $(mkdir_p) variable is still defined (to the same value as
@@ -134,8 +149,9 @@
     $(mkdir_p) in some of your rules, please plan to update them to
     $(MKDIR_P) at some point.
 
-  - ylwrap is now always used for lex and yacc source files,
-    regardless of whether there is more than one source per-directory.
+  - Automake installs an "Hello World!" example package in $(docdir).
+    This example is used thorough the new "Autotools Introduction"
+    chapter of the manual.
 
 New in 1.9:
 
diff --git a/aclocal.m4 b/aclocal.m4
index 5159cfb..abe3429 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.9a -*- Autoconf -*-
+# generated automatically by aclocal 1.9b -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006  Free Software Foundation, Inc.
diff --git a/configure b/configure
index 082c7ea..221fed3 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for GNU Automake 1.9a.
+# Generated by GNU Autoconf 2.60 for GNU Automake 1.9b.
 #
 # Report bugs to <bug-automake@gnu.org>.
 #
@@ -559,8 +559,8 @@
 # Identity of this package.
 PACKAGE_NAME='GNU Automake'
 PACKAGE_TARNAME='automake'
-PACKAGE_VERSION='1.9a'
-PACKAGE_STRING='GNU Automake 1.9a'
+PACKAGE_VERSION='1.9b'
+PACKAGE_STRING='GNU Automake 1.9b'
 PACKAGE_BUGREPORT='bug-automake@gnu.org'
 
 ac_unique_file="automake.in"
@@ -1144,7 +1144,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU Automake 1.9a to adapt to many kinds of systems.
+\`configure' configures GNU Automake 1.9b to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1213,7 +1213,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU Automake 1.9a:";;
+     short | recursive ) echo "Configuration of GNU Automake 1.9b:";;
    esac
   cat <<\_ACEOF
 
@@ -1278,7 +1278,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU Automake configure 1.9a
+GNU Automake configure 1.9b
 generated by GNU Autoconf 2.60
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1292,7 +1292,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU Automake $as_me 1.9a, which was
+It was created by GNU Automake $as_me 1.9b, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
@@ -1732,7 +1732,7 @@
 am_AUTOCONF="${AUTOCONF-autoconf}"
 
 
-am__api_version='1.9a'
+am__api_version='1.9b'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -1929,7 +1929,7 @@
 
 mkdir_p="$MKDIR_P"
 case $mkdir_p in
-  \\/$* | ?:\\/*) ;;
+  [\\/$]* | ?:[\\/]*) ;;
   */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
 esac
 
@@ -2034,7 +2034,7 @@
 
 # Define the identity of the package.
  PACKAGE='automake'
- VERSION='1.9a'
+ VERSION='1.9b'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3086,7 +3086,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GNU Automake $as_me 1.9a, which was
+This file was extended by GNU Automake $as_me 1.9b, which was
 generated by GNU Autoconf 2.60.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3129,7 +3129,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-GNU Automake config.status 1.9a
+GNU Automake config.status 1.9b
 configured by $0, generated by GNU Autoconf 2.60,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index b4b777e..c81d09e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 dnl Require Autoconf 2.60 for AC_REQUIRE_AUX_FILE.
 AC_PREREQ(2.60)
-AC_INIT([GNU Automake], [1.9a], [bug-automake@gnu.org])
+AC_INIT([GNU Automake], [1.9b], [bug-automake@gnu.org])
 
 AC_CONFIG_SRCDIR(automake.in)
 AC_CONFIG_AUX_DIR(lib)
diff --git a/doc/Makefile.in b/doc/Makefile.in
index d2ad925..9375c71 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9a from Makefile.am.
+# Makefile.in generated by automake 1.9b from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/doc/stamp-vti b/doc/stamp-vti
index 4c71d94..e2f2083 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 19 August 2006
+@set UPDATED 20 August 2006
 @set UPDATED-MONTH August 2006
-@set EDITION 1.9a
-@set VERSION 1.9a
+@set EDITION 1.9b
+@set VERSION 1.9b
diff --git a/doc/version.texi b/doc/version.texi
index 4c71d94..e2f2083 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 19 August 2006
+@set UPDATED 20 August 2006
 @set UPDATED-MONTH August 2006
-@set EDITION 1.9a
-@set VERSION 1.9a
+@set EDITION 1.9b
+@set VERSION 1.9b
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 652fb05..e806976 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9a from Makefile.am.
+# Makefile.in generated by automake 1.9b from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index e9e4ab1..219ece6 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9a from Makefile.am.
+# Makefile.in generated by automake 1.9b from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 6dead83..a25f04c 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9a from Makefile.am.
+# Makefile.in generated by automake 1.9b from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 7b15627..a4c66f4 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9a from Makefile.am.
+# Makefile.in generated by automake 1.9b from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 2a285ed..2ac2857 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9a from Makefile.am.
+# Makefile.in generated by automake 1.9b from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index 56aa836..6e6b1f9 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -12,10 +12,10 @@
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.9a'
+[am__api_version='1.9b'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.9a], [],
+m4_if([$1], [1.9b], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -31,5 +31,5 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.9a])dnl
+[AM_AUTOMAKE_VERSION([1.9b])dnl
 _AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 0aed6ee..fe0c982 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9a from Makefile.am.
+# Makefile.in generated by automake 1.9b from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,