diff --git a/ChangeLog b/ChangeLog
index 7b03e9d4..4075d74b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-09  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* configure.in: Don't attempt to use Emacs as a makeinfo
+	substitute.
+
 2003-11-07  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* README: Remove explicit version reference, so that the file
diff --git a/configure.in b/configure.in
index 98e673e3..822cc1eb 100644
--- a/configure.in
+++ b/configure.in
@@ -546,17 +546,14 @@ dnl internationalization macros
 WGET_WITH_NLS
 
 dnl
-dnl Find makeinfo.  If makeinfo is not found, look for Emacs.  If
-dnl Emacs cannot be found, look for XEmacs.
+dnl Find makeinfo.  We used to provide support for Emacs processing
+dnl Texinfo using `emacs -batch -eval ...' where makeinfo is
+dnl unavailable, but that broke with the addition of makeinfo-specific
+dnl command-line options, such as `-I'.  Now we depend on makeinfo to
+dnl build the Info documentation.
 dnl
 
-AC_CHECK_PROGS(MAKEINFO, makeinfo emacs xemacs)
-
-case "${MAKEINFO}" in
-   *makeinfo) MAKEINFO="${MAKEINFO} \$(srcdir)/wget.texi"  ;;
-   *emacs | *xemacs) MAKEINFO="${MAKEINFO} -batch -q -no-site-file -eval '(find-file \"\$(srcdir)/wget.texi\")' -l texinfmt -f texinfo-format-buffer -f save-buffer"  ;;
-   *) MAKEINFO="makeinfo \$(srcdir)/wget.texi"            ;;
-esac
+AC_CHECK_PROGS(MAKEINFO, makeinfo)
 
 dnl
 dnl Find perl and pod2man
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 06f22a48..92c3b04e 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -65,8 +65,8 @@ everything: all wget_us.ps wget_a4.ps wget_toc.html
 $(SAMPLERCTEXI): $(srcdir)/sample.wgetrc
 	sed s/@/@@/g $? > $@
 
-wget.info: $(SAMPLERCTEXI) $(srcdir)/wget.texi
-	$(MAKEINFO) -I$(srcdir)
+wget.info: $(srcdir)/wget.texi $(SAMPLERCTEXI)
+	$(MAKEINFO) -I$(srcdir) $<
 
 $(TEXI2POD): $(TEXI2POD).in
 	sed 's,^#! /usr/bin/perl,#! @PERL@,' $? > $@