diff --git a/ChangeLog b/ChangeLog
index 9316b7d..f461c97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-17  Richard Kreckel  <kreckel@ginac.de>
+
+        * cln-config.1: added manpage, as required by a couple of distros.
+        * Makefile.in, doc/Makefile.in: target install depends on installdirs.
+
 2000-11-16  Richard Kreckel  <kreckel@ginac.de>
 
         * autoconf/aclocal.m4 (CL_GMP_SET_UINTD): New macro...
diff --git a/Makefile.in b/Makefile.in
index 4123d57..12facc7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,6 +19,7 @@ RM = rm -f
 @SET_MAKE@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 UNINSTALL_PROGRAM = @UNINSTALL_PROGRAM@
 
 #### End of system configuration section. ####
@@ -28,18 +29,21 @@ SHELL = /bin/sh
 all : force
 	cd @subdir@; $(MAKE) all
 
-install : force
+install : installdirs force
 	cd @subdir@; $(MAKE) install
-	if [ ! -d $(bindir) ] ; then mkdir $(bindir) ; fi
 	$(INSTALL_PROGRAM) cln-config $(bindir)/cln-config
+	$(INSTALL_DATA) cln-config.1 $(mandir)/man1/cln-config.1
 
 installdirs : force
 	cd @subdir@; $(MAKE) installdirs
+	if [ ! -d $(mandir) ] ; then mkdir $(mandir) ; fi
+	if [ ! -d $(mandir)/man1 ] ; then mkdir $(mandir)/man1 ; fi
 	if [ ! -d $(bindir) ] ; then mkdir $(bindir) ; fi
 
 uninstall : force
 	cd @subdir@; $(MAKE) uninstall
 	$(RM) $(bindir)/cln-config
+	$(RM) $(mandir)/man1/cln-config.1
 
 check : force
 	cd @subdir@; $(MAKE) check
@@ -53,7 +57,7 @@ clean : force
 distclean : force
 	cd @subdir@; if test -f Makefile; then $(MAKE) distclean; fi
 	$(RM) config.status config.log config.cache Makefile
-	$(RM) cln-config
+	$(RM) cln-config cln-config.1 cln.spec
 	$(RM) libtool
 	$(RM) include/cln/config.h include/cln/intparam.h include/cln/floatparam.h src/base/cl_base_config.h src/base/cl_gmpconfig.h src/float/cl_float_config.h src/timing/cl_t_config.h
 
diff --git a/cln-config.1.in b/cln-config.1.in
new file mode 100644
index 0000000..7fc483f
--- /dev/null
+++ b/cln-config.1.in
@@ -0,0 +1,54 @@
+.TH cln-config 1 "November, 2000" "CLN @CL_VERSION@" "Bruno Haible"
+.SH NAME
+cln-config \- script to get information about the installed version of the CLN library
+.SH SYNOPSIS
+[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version] [\-\-libs] [\-\-cppflags]
+.SH DESCRIPTION
+.PP
+.B cln-config
+is a tool that is used to determine the compiler and linker flags that
+should be used to compile and link programs that use CLN.
+.SH OPTIONS
+.TP
+.B \-\-version
+Print the currently installed version of CLN on the standard output.
+.TP
+.B \-\-libs
+Print the linker flags that are necessary to link a CLN program.
+.TP
+.B \-\-cppflags
+Print the compiler flags that are necessary to compile a CLN program.
+.TP
+.B \-\-prefix=PREFIX
+If specified, use PREFIX instead of the installation prefix that CLN was
+built with when computing the output for the \-\-cppflags and \-\-libs
+options. This option is also used for the exec prefix if \-\-exec\-prefix was
+not specified. This option must be specified before any \-\-libs or
+\-\-cppflags options.
+.TP
+.B \-\-exec\-prefix=PREFIX
+If specified, use PREFIX instead of the installation exec prefix that CLN
+was built with when computing the output for the \-\-cppflags and \-\-libs
+options.  This option must be specified before any \-\-libs or \-\-cppflags
+options.
+.SH AUTHORS
+.br
+Richard Kreckel <kreckel@ginac.de>
+.br
+Bruno Haible <haible@clisp.cons.org>
+.SH COPYRIGHT
+CLN is Copyright \(co Bruno Haible 1995-2000
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git a/configure.in b/configure.in
index 84e4f0a..d4959f9 100644
--- a/configure.in
+++ b/configure.in
@@ -181,4 +181,4 @@ changequote([,])dnl
     cp "$srcdir/$f" "$f"
   fi
 done
-AC_OUTPUT([Makefile src/Makefile tests/Makefile benchmarks/Makefile examples/Makefile doc/Makefile cln-config cln.spec], [chmod +x cln-config])
+AC_OUTPUT([Makefile src/Makefile tests/Makefile benchmarks/Makefile examples/Makefile doc/Makefile cln-config cln-config.1 cln.spec], [chmod +x cln-config])
diff --git a/doc/Makefile.in b/doc/Makefile.in
index fd3902c..0eb5f3b 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -77,13 +77,9 @@ $(PACKAGE)_toc.html : $(srcdir)/$(PACKAGE).texi
 	cd $(srcdir) && $(TEXI2HTML) -expandinfo -number -split_chapter $(PACKAGE).texi
 
 
-install : all force
-	if [ ! -d $(datadir) ] ; then mkdir $(datadir) ; fi
-	if [ ! -d $(infodir) ] ; then mkdir $(infodir) ; fi
+install : all installdirs force
 	$(INSTALL_DATA) $(srcdir)/$(PACKAGE).info $(infodir)/$(PACKAGE).info
-	if [ ! -d $(htmldir) ] ; then mkdir $(htmldir) ; fi
 	$(INSTALL_DATA) $(srcdir)/$(PACKAGE)_*.html $(htmldir)
-	if [ ! -d $(dvidir) ] ; then mkdir $(dvidir) ; fi
 	$(INSTALL_DATA) $(srcdir)/$(PACKAGE).dvi $(dvidir)/$(PACKAGE).dvi
 
 installdirs : force