diff -ur automake-1.9.6.orig/doc/automake.texi automake-1.9.6/doc/automake.texi
--- automake-1.9.6.orig/doc/automake.texi	2005-07-09 10:28:44.000000000 +0100
+++ automake-1.9.6/doc/automake.texi	2009-07-01 14:33:35.000000000 +0100
@@ -1,7 +1,7 @@
 \input texinfo   @c -*-texinfo-*-
 @c %**start of header
-@setfilename automake.info
-@settitle automake
+@setfilename automake19.info
+@settitle automake19
 @setchapternewpage off
 @c %**end of header
 
@@ -34,12 +34,12 @@
 
 @dircategory Software development
 @direntry
-* automake: (automake).         Making Makefile.in's.
+* automake19: (automake19).     Making Makefile.in's.
 @end direntry
 
 @dircategory Individual utilities
 @direntry
-* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
+* aclocal-1.9: (automake19)Invoking aclocal.    Generating aclocal.m4.
 @end direntry
 
 @titlepage
@@ -6710,7 +6710,7 @@
 
 @example
 ETAGS_ARGS = automake.in --lang=none \
- --regex='/^@@node[ \t]+\([^,]+\)/\1/' automake.texi
+ --regex='/^@@node[ \t]+\([^,]+\)/\1/' automake19.texi
 @end example
 
 If you add file names to @code{ETAGS_ARGS}, you will probably also
diff -ur automake-1.9.6.orig/doc/Makefile.am automake-1.9.6/doc/Makefile.am
--- automake-1.9.6.orig/doc/Makefile.am	2005-05-14 21:21:05.000000000 +0100
+++ automake-1.9.6/doc/Makefile.am	2009-07-01 14:34:14.000000000 +0100
@@ -19,10 +19,10 @@
 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 ## 02110-1301, USA.
 
-info_TEXINFOS = automake.texi
+info_TEXINFOS = automake19.texi
 automake_TEXINFOS = fdl.texi
 
 # The following requires a fixed version of the Emacs 19.30 etags.
 ETAGS_ARGS = --lang=none \
- --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake.texi
-TAGS_DEPENDENCIES = automake.texi
+ --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake19.texi
+TAGS_DEPENDENCIES = automake19.texi
diff -ur automake-1.9.6.orig/doc/Makefile.in automake-1.9.6/doc/Makefile.in
--- automake-1.9.6.orig/doc/Makefile.in	2005-07-10 19:14:53.000000000 +0100
+++ automake-1.9.6/doc/Makefile.in	2009-07-01 14:45:48.000000000 +0100
@@ -52,14 +52,14 @@
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
-INFO_DEPS = $(srcdir)/automake.info
+INFO_DEPS = $(srcdir)/automake19.info
 TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex
 am__TEXINFO_TEX_DIR = $(top_srcdir)/lib
-DVIS = automake.dvi
-PDFS = automake.pdf
-PSS = automake.ps
-HTMLS = automake.html
-TEXINFOS = automake.texi
+DVIS = automake19.dvi
+PDFS = automake19.pdf
+PSS = automake19.ps
+HTMLS = automake19.html
+TEXINFOS = automake19.texi
 TEXI2DVI = texi2dvi
 TEXI2PDF = $(TEXI2DVI) --pdf --batch
 MAKEINFOHTML = $(MAKEINFO) --html
@@ -144,14 +144,14 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-info_TEXINFOS = automake.texi
+info_TEXINFOS = automake19.texi
 automake_TEXINFOS = fdl.texi
 
 # The following requires a fixed version of the Emacs 19.30 etags.
 ETAGS_ARGS = --lang=none \
- --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake.texi
+ --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake19.texi
 
-TAGS_DEPENDENCIES = automake.texi
+TAGS_DEPENDENCIES = automake19.texi
 all: all-am
 
 .SUFFIXES:
@@ -231,14 +231,14 @@
 	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
 	  exit 1; \
 	fi
-$(srcdir)/automake.info: automake.texi $(srcdir)/version.texi $(automake_TEXINFOS)
-automake.dvi: automake.texi $(srcdir)/version.texi $(automake_TEXINFOS)
-automake.pdf: automake.texi $(srcdir)/version.texi $(automake_TEXINFOS)
-automake.html: automake.texi $(srcdir)/version.texi $(automake_TEXINFOS)
+$(srcdir)/automake19.info: automake19.texi $(srcdir)/version.texi $(automake_TEXINFOS)
+automake19.dvi: automake19.texi $(srcdir)/version.texi $(automake_TEXINFOS)
+automake19.pdf: automake19.texi $(srcdir)/version.texi $(automake_TEXINFOS)
+automake19.html: automake19.texi $(srcdir)/version.texi $(automake_TEXINFOS)
 $(srcdir)/version.texi:  $(srcdir)/stamp-vti
-$(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure
-	@(dir=.; test -f ./automake.texi || dir=$(srcdir); \
-	set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake.texi`; \
+$(srcdir)/stamp-vti: automake19.texi $(top_srcdir)/configure
+	@(dir=.; test -f ./automake19.texi || dir=$(srcdir); \
+	set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake19.texi`; \
 	echo "@set UPDATED $$1 $$2 $$3"; \
 	echo "@set UPDATED-MONTH $$2 $$3"; \
 	echo "@set EDITION $(VERSION)"; \
@@ -296,12 +296,12 @@
 	done
 
 mostlyclean-aminfo:
-	-rm -rf automake.ac automake.aux automake.cm automake.cp automake.cps \
-	  automake.fn automake.fns automake.ky automake.kys \
-	  automake.log automake.op automake.pg automake.pgs \
-	  automake.tmp automake.toc automake.tp automake.tps \
-	  automake.tr automake.vr automake.vrs automake.dvi \
-	  automake.pdf automake.ps automake.html
+	-rm -rf automake19.ac automake19.aux automake19.cm automake19.cp automake19.cps \
+	  automake19.fn automake19.fns automake19.ky automake19.kys \
+	  automake19.log automake19.op automake19.pg automake19.pgs \
+	  automake19.tmp automake19.toc automake19.tp automake19.tps \
+	  automake19.tr automake19.vr automake19.vrs automake19.dvi \
+	  automake19.pdf automake19.ps automake19.html
 
 maintainer-clean-aminfo:
 	@list='$(INFO_DEPS)'; for i in $$list; do \