diff -urN autoconf-2.58/doc/Makefile.in autoconf-2.58.info/doc/Makefile.in
--- autoconf-2.58/doc/Makefile.in	2003-09-28 16:42:23.267768088 +0200
+++ autoconf-2.58.info/doc/Makefile.in	2003-09-28 16:42:47.480087256 +0200
@@ -44,12 +44,12 @@
 DIST_SOURCES =
 TEXINFO_TEX = $(top_srcdir)/config/texinfo.tex
 am__TEXINFO_TEX_DIR = $(top_srcdir)/config
-INFO_DEPS = autoconf.info standards.info
+INFO_DEPS = autoconf25.info standards.info
 DVIS = autoconf.dvi standards.dvi
 PDFS = autoconf.pdf standards.pdf
 PSS = autoconf.ps standards.ps
 HTMLS = autoconf.html standards.html
-TEXINFOS = autoconf.texi standards.texi
+TEXINFOS = autoconf25.texi standards.texi
 TEXI2PDF = $(TEXI2DVI) --pdf --batch
 DVIPS = dvips
 am__installdirs = $(DESTDIR)$(infodir)
@@ -116,7 +116,7 @@
 TEXI2DVI = texi2dvi --batch
 TEXI2HTML = texi2html
 TEXI2HTML_FLAGS = -split_chapter
-info_TEXINFOS = autoconf.texi standards.texi
+info_TEXINFOS = autoconf25.texi standards.texi
 autoconf_TEXINFOS = fdl.texi install.texi
 standards_TEXINFOS = make-stds.texi
 
@@ -192,14 +192,14 @@
 .texi.html:
 	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --html -I $(srcdir) \
 	 -o $@ $<
-autoconf.info: autoconf.texi version.texi $(autoconf_TEXINFOS)
-autoconf.dvi: autoconf.texi version.texi $(autoconf_TEXINFOS)
-autoconf.pdf: autoconf.texi version.texi $(autoconf_TEXINFOS)
-autoconf.html: autoconf.texi version.texi $(autoconf_TEXINFOS)
+autoconf25.info: autoconf25.texi version.texi $(autoconf_TEXINFOS)
+autoconf.dvi: autoconf25.texi version.texi $(autoconf_TEXINFOS)
+autoconf.pdf: autoconf25.texi version.texi $(autoconf_TEXINFOS)
+autoconf.html: autoconf25.texi version.texi $(autoconf_TEXINFOS)
 version.texi:  stamp-vti
-stamp-vti: autoconf.texi $(top_srcdir)/configure
-	@(dir=.; test -f ./autoconf.texi || dir=$(srcdir); \
-	set `$(SHELL) $(top_srcdir)/config/mdate-sh $$dir/autoconf.texi`; \
+stamp-vti: autoconf25.texi $(top_srcdir)/configure
+	@(dir=.; test -f ./autoconf25.texi || dir=$(srcdir); \
+	set `$(SHELL) $(top_srcdir)/config/mdate-sh $$dir/autoconf25.texi`; \
 	echo "@set UPDATED $$1 $$2 $$3"; \
 	echo "@set UPDATED-MONTH $$2 $$3"; \
 	echo "@set EDITION $(VERSION)"; \
@@ -430,8 +430,8 @@
 
 html: autoconf_1.html standards_1.html
 
-autoconf_1.html: autoconf.texi install.texi
-	$(TEXI2HTML) $(TEXI2HTML_FLAGS) $(srcdir)/autoconf.texi
+autoconf_1.html: autoconf25.texi install.texi
+	$(TEXI2HTML) $(TEXI2HTML_FLAGS) $(srcdir)/autoconf25.texi
 
 standards_1.html: standards.texi make-stds.texi
 	$(TEXI2HTML) $(TEXI2HTML_FLAGS) $(srcdir)/standards.texi
diff -urN autoconf-2.58/doc/autoconf.texi autoconf-2.58.info/doc/autoconf.texi
--- autoconf-2.58/doc/autoconf.texi	2003-09-28 16:42:23.283765656 +0200
+++ autoconf-2.58.info/doc/autoconf.texi	2003-09-28 16:43:17.728488800 +0200
@@ -1,9 +1,9 @@
 \input texinfo @c -*-texinfo-*-
 @comment ========================================================
 @comment %**start of header
-@setfilename autoconf.info
+@setfilename autoconf25.info
 @include version.texi
-@settitle Autoconf
+@settitle Autoconf v2.5
 @setchapternewpage odd
 @setcontentsaftertitlepage
 @finalout
@@ -210,27 +210,27 @@
 
 @dircategory Software development
 @direntry
-* Autoconf: (autoconf).         Create source code configuration scripts.
+* Autoconf v2.5: (autoconf25).         Create source code configuration scripts.
 @end direntry
 
 @dircategory Individual utilities
 @direntry
-* autoscan: (autoconf)autoscan Invocation.
+* autoscan v2.5: (autoconf25)autoscan Invocation.
                                 Semi-automatic @file{configure.ac} writing
-* ifnames: (autoconf)ifnames Invocation.        Listing conditionals in source.
-* autoconf: (autoconf)autoconf Invocation.
+* ifnames v2.5: (autoconf25)ifnames Invocation.        Listing conditionals in source.
+* autoconf v2.5: (autoconf25)autoconf Invocation.
                                 How to create configuration scripts
-* autoreconf: (autoconf)autoreconf Invocation.
+* autoreconf v2.5: (autoconf25)autoreconf Invocation.
                                 Remaking multiple @command{configure} scripts
-* autoheader: (autoconf)autoheader Invocation.
+* autoheader v2.5: (autoconf25)autoheader Invocation.
                                 How to create configuration templates
-* autom4te: (autoconf)autom4te Invocation.
+* autom4te v2.5: (autoconf25)autom4te Invocation.
                                 The Autoconf executables backbone
-* configure: (autoconf)configure Invocation.    Configuring a package.
-* autoupdate: (autoconf)autoupdate Invocation.
+* configure v2.5: (autoconf25)configure Invocation.    Configuring a package.
+* autoupdate v2.5: (autoconf25)autoupdate Invocation.
                                 Automatic update of @file{configure.ac}
-* config.status: (autoconf)config.status Invocation. Recreating configurations.
-* testsuite: (autoconf)testsuite Invocation.    Running an Autotest test suite.
+* config.status v2.5: (autoconf25)config.status Invocation. Recreating configurations.
+* testsuite v2.5: (autoconf25)testsuite Invocation.    Running an Autotest test suite.
 @end direntry
 
 @titlepage