diff --git a/ChangeLog b/ChangeLog
index b5a63d49..b9c3c716 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-06  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* configure.in: Set MAKEINFO to "true" so build doesn't fail for
+	users without either makeinfo or the pre-packaged info files.
+
 2005-05-02  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* INSTALL: Document environment variables affecting configure,
diff --git a/configure.in b/configure.in
index e7694bd3..c1ee708b 100644
--- a/configure.in
+++ b/configure.in
@@ -593,13 +593,13 @@ dnl command-line options, such as `-I'.  Now we depend on makeinfo to
 dnl build the Info documentation.
 dnl
 
-AC_CHECK_PROGS(MAKEINFO, makeinfo)
+AC_CHECK_PROGS(MAKEINFO, [makeinfo], [true])
 
 dnl
 dnl Find perl and pod2man
 dnl
 
-AC_PATH_PROGS(PERL, perl5 perl, no)
+AC_PATH_PROGS(PERL, [perl5 perl], no)
 AC_PATH_PROG(POD2MAN, pod2man, no)
 
 if test "x${POD2MAN}" = xno; then