diff --git a/ChangeLog b/ChangeLog
index e40a7c17f7..ceaf933db8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,10 @@ Fri Apr 17 18:27:51 1992  Per Bothner  (bothner@cygnus.com)
 
 	* configure: mkdir ${subdir} as needed.
 
+Wed Apr 15 17:37:22 1992  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in,configure.in: added autoconf.
+
 Wed Apr 15 17:27:34 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
 
 	* Makefile.in: no longer pass against on recursion.
diff --git a/Makefile.in b/Makefile.in
index 81be171e39..dbf82a772e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -111,8 +111,8 @@ install-info: install-info-dirs force
 install-dir.info:
 	$(INSTALL_DATA) dir.info $(infodir)/dir.info
 
-all.normal: all-libiberty all-mmalloc all-texinfo all-bison \
-	all-byacc all-flex all-bfd all-ld all-gas all-gcc \
+all.normal: all-autoconf all-libiberty all-mmalloc all-texinfo \
+	all-bison all-byacc all-flex all-bfd all-ld all-gas all-gcc \
 	all-binutils all-libg++ all-readline all-gdb \
 	all-make all-rcs all-cvs all-diff all-grep \
 	all-patch all-emacs all-ispell all-fileutils \
@@ -122,8 +122,8 @@ all.cross: all-libiberty all-mmalloc all-gas all-bison all-ld \
 	all-bfd all-libgcc all-readline all-gdb
 #	$(MAKE) subdir_do DO=all "DODIRS=$(SUBDIRS) $(OTHERS)"
 
-clean: clean-libiberty clean-mmalloc clean-texinfo clean-bfd \
-	clean-newlib clean-binutils clean-flex \
+clean: clean-autoconf clean-libiberty clean-mmalloc clean-texinfo \
+	clean-bfd clean-newlib clean-binutils clean-flex \
 	clean-bison clean-byacc clean-ld clean-gas \
 	clean-gcc clean-libgcc clean-readline clean-glob clean-gdb \
 	clean-make clean-diff clean-grep clean-rcs \
@@ -138,19 +138,81 @@ install: $(INSTALL_TARGET) $(srcdir)/configure.man
 	$(INSTALL_DATA) $(srcdir)/configure.man $(man1dir)/configure.1
 
 
-install.all: install-dirs install-libiberty install-mmalloc install-texinfo \
-        install-bfd install-binutils install-bison install-byacc install-flex \
-        install-ld install-gas install-gcc install-gprof \
-        install-libgcc install-readline install-glob install-gdb \
-        install-make install-cvs install-patch install-emacs \
-        install-ispell install-fileutils install-libg++ install-newlib \
-        install-send_pr
+install.all: install-dirs install-autoconf install-libiberty \
+	install-mmalloc install-texinfo install-bfd install-binutils \
+	install-bison install-byacc install-flex install-ld \
+	install-gas install-gcc install-gprof install-libgcc \
+	install-readline install-glob install-gdb install-make \
+	install-cvs install-patch install-emacs install-ispell \
+	install-fileutils install-libg++ install-newlib \
+	install-send_pr
 
 install.cross: install-dirs install-libiberty install-mmalloc \
         install-binutils install-bison install-byacc install-flex \
         install-ld install-gas install-libgcc install-readline \
         install-glob install-gdb install-mmalloc install-gprof
 
+### autoconf
+all-autoconf: force
+	@if [ -d ./autoconf ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./autoconf; \
+		$(MAKE) \
+			"against=$(against)" \
+			"AR=$(AR)" \
+			"AR_FLAGS=$(AR_FLAGS)" \
+			"CC=$(CC)" \
+			"MINUS_G=$(MINUS_G)" \
+			"RANLIB=$(RANLIB)" \
+			"LOADLIBES=$(LOADLIBES)" \
+			"LDFLAGS=$(LDFLAGS)" \
+			"BISON=$(BISON)" \
+			"MAKEINFO=$(MAKEINFO)" \
+			all) ; \
+	else \
+		true ; \
+	fi
+
+clean-autoconf: force
+	@if [ -d ./autoconf ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./autoconf; \
+		$(MAKE) \
+			"against=$(against)" \
+			"AR=$(AR)" \
+			"AR_FLAGS=$(AR_FLAGS)" \
+			"CC=$(CC)" \
+			"MINUS_G=$(MINUS_G)" \
+			"RANLIB=$(RANLIB)" \
+			"LOADLIBES=$(LOADLIBES)" \
+			"LDFLAGS=$(LDFLAGS)" \
+			"BISON=$(BISON)" \
+			"MAKEINFO=$(MAKEINFO)" \
+			clean) ; \
+	else \
+		true ; \
+	fi
+
+install-autoconf: force
+	@if [ -d ./autoconf ] ; then \
+		rootme=`pwd` ; export rootme ; \
+		(cd ./autoconf; \
+		$(MAKE) \
+			"against=$(against)" \
+			"AR=$(AR)" \
+			"AR_FLAGS=$(AR_FLAGS)" \
+			"CC=$(CC)" \
+			"MINUS_G=$(MINUS_G)" \
+			"RANLIB=$(RANLIB)" \
+			"LOADLIBES=$(LOADLIBES)" \
+			"LDFLAGS=$(LDFLAGS)" \
+			"BISON=$(BISON)" \
+			"MAKEINFO=$(MAKEINFO)" \
+			install) ; \
+	else \
+		true ; \
+	fi
+
 ### libiberty
 all-libiberty: force
 	@if [ -d ./libiberty ] ; then \
diff --git a/configure.in b/configure.in
index 5357870841..c3d1e84714 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@
 # script appropriate for this directory.  For more information, check
 # any existing configure script.
 
-configdirs="mmalloc libiberty texinfo bfd binutils byacc bison flex gcc readline glob ld gas gdb emacs ispell make grep diff rcs cvs patch send_pr libg++ newlib gprof gdbtest"
+configdirs="autoconf mmalloc libiberty texinfo bfd binutils byacc bison flex gcc readline glob ld gas gdb emacs ispell make grep diff rcs cvs patch send_pr libg++ newlib gprof gdbtest"
 srctrigger=cfg-paper.texi
 srcname="gnu development package"