diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 0ab2de5e3..75f74a268 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -403,3 +403,12 @@ case "${ECL_NEWLINE}" in
 esac
 ])
 
+dnl
+dnl ------------------------------------------------------------
+dnl Find out which program we can use to install INFO files
+dnl
+AC_DEFUN(ECL_INSTALL_INFO,[
+AC_SUBST(INSTALL_INFO)
+AC_PATH_PROG(INSTALL_INFO, install-info, [/sbin/install-info],
+[$PATH:/usr/bin:/usr/sbin:/usr/etc:/usr/libexec])
+])
\ No newline at end of file
diff --git a/src/configure b/src/configure
index 12885639b..e80a895b6 100755
--- a/src/configure
+++ b/src/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ECL_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os thehost builddir top_srcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S ECL_CC ECL_CFLAGS CLIBS SHARED_LDFLAGS BUNDLE_LDFLAGS SHORT_SITE_NAME LONG_SITE_NAME EXTRA_OBJS TARGETS TKLIBS SUBDIR LIBRARIES LSP_LIBRARIES BOEHM_HEADERS EGREP true_srcdir true_builddir CP RM MV EXE_SUFFIX ARCHITECTURE SOFTWARE_TYPE SOFTWARE_VERSION MACHINE_INSTANCE MACHINE_VERSION LDRPATH LIBPREFIX LIBEXT SHAREDEXT SHAREDPREFIX LDINSTALLNAME ECL_SETJMP ECL_LONGJMP ECL_FILE_CNT CL_FIXNUM_TYPE CL_FIXNUM_BITS CL_FIXNUM_MAX CL_FIXNUM_MIN X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINCLUDES XLIBS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ECL_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os thehost builddir top_srcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S ECL_CC ECL_CFLAGS CLIBS SHARED_LDFLAGS BUNDLE_LDFLAGS SHORT_SITE_NAME LONG_SITE_NAME EXTRA_OBJS TARGETS TKLIBS SUBDIR LIBRARIES LSP_LIBRARIES BOEHM_HEADERS EGREP true_srcdir true_builddir CP RM MV EXE_SUFFIX ARCHITECTURE SOFTWARE_TYPE SOFTWARE_VERSION MACHINE_INSTANCE MACHINE_VERSION LDRPATH LIBPREFIX LIBEXT SHAREDEXT SHAREDPREFIX LDINSTALLNAME ECL_SETJMP ECL_LONGJMP ECL_FILE_CNT INFOEXT INSTALL_INFO CL_FIXNUM_TYPE CL_FIXNUM_BITS CL_FIXNUM_MAX CL_FIXNUM_MIN X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINCLUDES XLIBS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -4253,6 +4253,55 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
 
+
+
+# Extract the first word of "install-info", so it can be a program name with args.
+set dummy install-info; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_INSTALL_INFO+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $INSTALL_INFO in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_INSTALL_INFO="$INSTALL_INFO" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:/sbin:/usr/sbin:/usr/etc"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_INSTALL_INFO="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_path_INSTALL_INFO" && ac_cv_path_INSTALL_INFO="foo"
+  ;;
+esac
+fi
+INSTALL_INFO=$ac_cv_path_INSTALL_INFO
+
+if test -n "$INSTALL_INFO"; then
+  echo "$as_me:$LINENO: result: $INSTALL_INFO" >&5
+echo "${ECHO_T}$INSTALL_INFO" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if which gzip; then
+  INFOEXT=info.gz
+else
+  INFOEXT=info
+fi
+
 TARGETS="ecl${EXEEXT}"
 LIBRARIES=""
 LSP_LIBRARIES="${LIBPREFIX}ecl.${LIBEXT}"
@@ -6719,6 +6768,8 @@ s,@LDINSTALLNAME@,$LDINSTALLNAME,;t t
 s,@ECL_SETJMP@,$ECL_SETJMP,;t t
 s,@ECL_LONGJMP@,$ECL_LONGJMP,;t t
 s,@ECL_FILE_CNT@,$ECL_FILE_CNT,;t t
+s,@INFOEXT@,$INFOEXT,;t t
+s,@INSTALL_INFO@,$INSTALL_INFO,;t t
 s,@CL_FIXNUM_TYPE@,$CL_FIXNUM_TYPE,;t t
 s,@CL_FIXNUM_BITS@,$CL_FIXNUM_BITS,;t t
 s,@CL_FIXNUM_MAX@,$CL_FIXNUM_MAX,;t t
diff --git a/src/configure.in b/src/configure.in
index 2d0f6eebe..02cfa7fc3 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -161,6 +161,18 @@ ECL_LINEFEED_MODE()
 ECL_FIND_SETJMP()
 ECL_FILE_STRUCTURE()
 
+dnl ------------------------------------------------------------
+dnl Find out how to install the INFO files.
+dnl
+AC_SUBST(INFOEXT)
+AC_SUBST(INSTALL_INFO)
+AC_PATH_PROG([INSTALL_INFO], [install-info], [foo], [$PATH:/sbin:/usr/sbin:/usr/etc])
+if which gzip; then
+  INFOEXT=info.gz
+else
+  INFOEXT=info
+fi
+
 dnl ----------------------------------------------------------------------
 dnl		Set options
 dnl
diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in
index 1763f27e1..4d02ba38a 100644
--- a/src/doc/Makefile.in
+++ b/src/doc/Makefile.in
@@ -7,10 +7,12 @@ infodir = @infodir@
 mandir=@mandir@
 manext=1
 
+INFOEXT = @INFOEXT@
 SHELL = @SHELL@
 INSTALL	= @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+INSTALL_INFO = @INSTALL_INFO@
 mkinstalldirs = $(SHELL) $(top_srcdir)/gc/mkinstalldirs
 
 VERSION=@ECL_VERSION@
@@ -22,7 +24,7 @@ FILTER = sed 's,@VERSION@,$(VERSION),g'
 
 ECL = ../ecl
 
-all: ecl.info ecldev.info $(HTML)
+all: ecl.$(INFOEXT) ecldev.$(INFOEXT) $(HTML)
 
 ecl.dvi: $(srcdir)/user.txi $(srcdir)/macros.txi clisp.sty ecl.sty
 	tex $(srcdir)/user.txi
@@ -36,14 +38,18 @@ ecldev.ps: ecldev.dvi $(srcdir)/macros.txi
 
 install: all
 	$(mkinstalldirs) $(infodir)
-	$(INSTALL_DATA) ecl.info $(infodir)
-	$(INSTALL_DATA) ecldev.info $(infodir)
+	$(INSTALL_DATA) ecl.$(INFOEXT) $(infodir);
+	$(INSTALL_DATA) ecldev.$(INFOEXT) $(infodir);
+	if [ -x $(INSTALL_INFO) ]; then \
+	  $(INSTALL_INFO) --infodir=$(infodir) ecl.$(INFOEXT); \
+	  $(INSTALL_INFO) --infodir=$(infodir) ecldev.$(INFOEXT); \
+	fi
 	$(mkinstalldirs) $(mandir)/man$(manext)
 	$(INSTALL_DATA) ecl.man $(mandir)/man$(manext)/ecl.$(manext)
 flatinstall: all
 	$(mkinstalldirs) $(prefix)/doc
-	$(INSTALL_DATA) ecl.info $(prefix)/doc
-	$(INSTALL_DATA) ecldev.info $(prefix)/doc
+	$(INSTALL_DATA) ecl.$(INFOEXT) $(prefix)/doc
+	$(INSTALL_DATA) ecldev.$(INFOEXT) $(prefix)/doc
 	if [ -f user.html ]; then \
 	  $(INSTALL_DATA) $$i $(prefix)/doc/; \
 	else \
@@ -59,7 +65,11 @@ flatinstall: all
 	for i in *.html; do $(INSTALL_DATA) $$i $(prefix)/doc/; done
 
 uninstall:
-	rm -r $(infodir)/ecl.info $(infodir)/ecldev.info
+	if [ -x $(INSTALL_INFO) ]; then \
+	  $(INSTALL_INFO) --delete ecl.$(INFOEXT); \
+	  $(INSTALL_INFO) --delete ecl.$(INFOEXT); \
+	fi
+	rm -r $(infodir)/ecl.$(INFOEXT) $(infodir)/ecldev.$(INFOEXT); \
 	rm $(mandir)/man$(manext)/ecl.$(manext)
 
 head: developers_manual user_manual $(srcdir)/head
@@ -69,6 +79,10 @@ head: developers_manual user_manual $(srcdir)/head
 	else \
 	  cp $(srcdir)/head head; \
 	fi
+ecl.info.gz: ecl.info
+	gzip < ecl.info > ecl.info.gz
+ecldev.info.gz: ecldev.info
+	gzip < ecldev.info > ecldev.info.gz
 ecl.info: $(srcdir)/user.txi $(srcdir)/macros.txi
 	makeinfo -I $(srcdir) --no-split $(srcdir)/user.txi
 ecldev.info: $(srcdir)/devel.txi $(srcdir)/macros.txi
@@ -112,4 +126,4 @@ developers_manual: $(srcdir)/devel.txi $(srcdir)/macros.txi
 	|| (makeinfo -I $(srcdir) --html $(srcdir)/devel.txi)) \
 	&& touch developers_manual
 clean:
-	rm -r -f ecl ecldev ecl.info ecldev.info *.html user_manual developers_manual
+	rm -r -f ecl ecldev ecl.info* ecldev.info* *.html user_manual developers_manual