diff --git a/src/CHANGELOG b/src/CHANGELOG
index 2639a27a2..9f1102e05 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -77,6 +77,8 @@ ECL 0.9i
  - Included support for multithreading under Windows/Cygwin (Thanks to Arthur
    Smyles for pointing out the differences from Linux's pthreads)
 
+ - New manual file for 'ecl-config' contributed by Peter Van Eynde.
+
 * Errors fixed:
 
  - The intermediate output of the compiler is written in the directory in which
diff --git a/src/configure b/src/configure
index 370537f15..1c3accd50 100755
--- a/src/configure
+++ b/src/configure
@@ -9862,7 +9862,7 @@ echo "$as_me: Configuring included GMP library:" >&6;}
 fi
 
 
-                                                                                                                                            ac_config_files="$ac_config_files bare.lsp lsp/load.lsp clos/load.lsp cmp/load.lsp ../Makefile Makefile c/Makefile doc/Makefile doc/ecl.man ecl/configpre.h:h/config.h.in bin/ecl-config.pre:util/ecl-config lsp/config.pre:lsp/config.lsp.in compile.pre:compile.lsp.in cmp/cmpdefs.pre:cmp/cmpdefs.lsp"
+                                                                                                                                                      ac_config_files="$ac_config_files bare.lsp lsp/load.lsp clos/load.lsp cmp/load.lsp ../Makefile Makefile c/Makefile doc/Makefile doc/ecl.man doc/ecl-config.man ecl/configpre.h:h/config.h.in bin/ecl-config.pre:util/ecl-config lsp/config.pre:lsp/config.lsp.in compile.pre:compile.lsp.in cmp/cmpdefs.pre:cmp/cmpdefs.lsp"
 
           ac_config_headers="$ac_config_headers ecl/config.h:ecl/configpre.h"
  # FIXME
@@ -10400,6 +10400,7 @@ do
   "c/Makefile" ) CONFIG_FILES="$CONFIG_FILES c/Makefile" ;;
   "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
   "doc/ecl.man" ) CONFIG_FILES="$CONFIG_FILES doc/ecl.man" ;;
+  "doc/ecl-config.man" ) CONFIG_FILES="$CONFIG_FILES doc/ecl-config.man" ;;
   "ecl/configpre.h" ) CONFIG_FILES="$CONFIG_FILES ecl/configpre.h:h/config.h.in" ;;
   "bin/ecl-config.pre" ) CONFIG_FILES="$CONFIG_FILES bin/ecl-config.pre:util/ecl-config" ;;
   "lsp/config.pre" ) CONFIG_FILES="$CONFIG_FILES lsp/config.pre:lsp/config.lsp.in" ;;
diff --git a/src/configure.in b/src/configure.in
index b93d2b7db..322182e20 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -507,7 +507,7 @@ fi
 
 AC_CONFIG_FILES([
   bare.lsp lsp/load.lsp clos/load.lsp cmp/load.lsp
-  ../Makefile Makefile c/Makefile doc/Makefile doc/ecl.man
+  ../Makefile Makefile c/Makefile doc/Makefile doc/ecl.man doc/ecl-config.man
   ecl/configpre.h:h/config.h.in bin/ecl-config.pre:util/ecl-config
   lsp/config.pre:lsp/config.lsp.in compile.pre:compile.lsp.in
   cmp/cmpdefs.pre:cmp/cmpdefs.lsp
diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in
index bf6482a15..457dcccb6 100644
--- a/src/doc/Makefile.in
+++ b/src/doc/Makefile.in
@@ -57,6 +57,7 @@ install: all
 	done
 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man$(manext)
 	$(INSTALL_DATA) ecl.man $(DESTDIR)$(mandir)/man$(manext)/ecl.$(manext)
+	$(INSTALL_DATA) ecl-config.man $(DESTDIR)$(mandir)/man$(manext)/ecl-config.$(manext)
 flatinstall: all $(HTML_FILES)
 	$(mkinstalldirs) $(DESTDIR)$(docdir)
 	for k in $(INFO_FILES); do $(INSTALL_DATA) $$k $(DESTDIR)$(docdir); done
diff --git a/src/doc/ecl-config.man.in b/src/doc/ecl-config.man.in
new file mode 100644
index 000000000..8cc30f536
--- /dev/null
+++ b/src/doc/ecl-config.man.in
@@ -0,0 +1,30 @@
+.TH ECL-CONFIG 1 04/03/06
+.SH NAME
+ecl-config \- Embeddable Common LISP configuration query
+.SH SYNOPSIS
+\fBecl\-config\fP
+[\fB\-cflags]
+[\fB\-libs]
+[\fB\-ldflags]
+[\fB LIBS]
+.SH DESCRIPTION
+ecl\-config will return through the standard output the set
+of compiler or linker flags needed to build applications that
+embed ecl.
+.SH OPTIONS
+.TP
+.BI \-cflags
+Output the flags required to compile a C/C++ file.
+.TP
+.B \-libs
+.TP
+.B \-ldflags
+Return the linker flags required to build a C/C++ application or shared library.
+.TP
+.B LIBS
+When also using
+.B \-ldflags
+also add the cmp (compiler) library.
+.SH "BUGS"
+Probably some. Report them!
+