diff --git a/ChangeLog b/ChangeLog
index 21cda01..6910a83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-19  Richard B. Kreckel  <kreckel@ginac.de>
+
+	* doc/cln.tex: Put entire document in @dircategory Mathematics.
+	* doc/Makefile.in: texi2html -split_chapter suddenly uses subdirectory.
+	* Makefile.in: Don't install non-existing cln-config* and cln.m4.
+
 2007-09-18  Richard B. Kreckel  <kreckel@ginac.de>
 
 	* include/cln/modules.h (CL_JUMP_TO): Use a pc relative jump on m68k.
diff --git a/Makefile.in b/Makefile.in
index bd56856..1331aad 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,9 +35,6 @@ all : force
 
 install : installdirs force
 	cd @subdir@ && ${MAKE} install
-	${INSTALL_SCRIPT} cln-config ${DESTDIR}${bindir}/cln-config
-	${INSTALL_DATA} cln-config.1 ${DESTDIR}${mandir}/man1/cln-config.1
-	${INSTALL_DATA} ${srcdir}/cln.m4 ${DESTDIR}${datadir}/aclocal/cln.m4
 	${INSTALL_DATA} cln.pc ${DESTDIR}${libdir}/pkgconfig/cln.pc
 
 installdirs : force
@@ -49,9 +46,6 @@ installdirs : force
 
 uninstall : force
 	cd @subdir@ && ${MAKE} uninstall
-	${RM} ${DESTDIR}${bindir}/cln-config
-	${RM} ${DESTDIR}${mandir}/man1/cln-config.1
-	${RM} ${DESTDIR}${datadir}/aclocal/cln.m4
 	${RM} ${DESTDIR}${libdir}/pkgconfig/cln.pc
 
 check : force
@@ -66,14 +60,14 @@ 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 cln-config.1 cln.pc
+	${RM} cln.pc
 	${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
 
 maintainer-clean : force
 	cd @subdir@ && if test -f Makefile; then ${MAKE} maintainer-clean; fi
 	${RM} config.status config.log config.cache Makefile
-	${RM} cln-config cln-config.1 cln.spec cln.pc
+	${RM} cln.spec cln.pc
 	${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/doc/Makefile.in b/doc/Makefile.in
index 914c360..06f44d8 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -19,6 +19,7 @@ DESTDIR =
 
 # Programs used by "make":
 RM = rm -f
+RM_R = rm -rf
 MKDIR = mkdir -p
 @SET_MAKE@
 
@@ -71,12 +72,12 @@ ${srcdir}/${PACKAGE}.ps : ${srcdir}/${PACKAGE}.dvi
 	${DVIPS} -o $@ $<
 
 
-html : ${PACKAGE}.html ${PACKAGE}_toc.html
+html : ${PACKAGE}.html ${PACKAGE}/${PACKAGE}_toc.html
 
 ${PACKAGE}.html : ${srcdir}/${PACKAGE}.texi
 	cd ${srcdir} && ${TEXI2HTML} -expandinfo -number -monolithic ${PACKAGE}.texi
 
-${PACKAGE}_toc.html : ${srcdir}/${PACKAGE}.texi
+${PACKAGE}/${PACKAGE}_toc.html : ${srcdir}/${PACKAGE}.texi
 	cd ${srcdir} && ${TEXI2HTML} -expandinfo -number -split_chapter ${PACKAGE}.texi
 
 
@@ -87,7 +88,7 @@ install : all installdirs force
 	  echo " install-info --info-dir=${DESTDIR}${infodir} ${DESTDIR}${infodir}/${PACKAGE}.info";\
 	  install-info --info-dir=${DESTDIR}${infodir} ${DESTDIR}${infodir}/${PACKAGE}.info || :;\
 	else : ; fi
-	${INSTALL_DATA} ${srcdir}/${PACKAGE}_*.html ${DESTDIR}${htmldir}
+	${INSTALL_DATA} ${srcdir}/${PACKAGE}/${PACKAGE}*.html ${DESTDIR}${htmldir}
 	${INSTALL_DATA} ${srcdir}/${PACKAGE}.dvi ${DESTDIR}${dvidir}/${PACKAGE}.dvi
 
 installdirs : force
@@ -118,6 +119,7 @@ distclean : clean
 
 maintainer-clean : distclean
 	${RM} *.info *.dvi *.ps *.html
+	${RM_R} cln/
 	if [ -f ${PACKAGE}.tex ] ; then ${RM} ${PACKAGE}.texi ; fi
 
 force :
diff --git a/doc/cln.tex b/doc/cln.tex
index f2f3495..0d32d33 100644
--- a/doc/cln.tex
+++ b/doc/cln.tex
@@ -8,6 +8,7 @@
 @paragraphindent 0
 @c %**end of header
 
+@dircategory Mathematics
 @direntry
 * CLN: (cln).                       Class Library for Numbers (C++).
 @end direntry