diff --git a/ChangeLog b/ChangeLog
index 0d6427ef5..e34828bb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,9 @@
 	  scanners seem to work.
 	* README.linux: Minor updates.
 	* README.openbsd: libusb is necessary for some backends.
-
+	* Makefile.in doc/Makefile.in doc/sane.man: The lists of supported
+	  devices are now generated and installed by default.
+	
 2003-04-18  Frank Zago  <fzago at austin dot rr dot com>
 
 	* backend/teco2.c backend/teco2.conf backend/teco2.h
diff --git a/Makefile.in b/Makefile.in
index e72836b88..81d1b4ee2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,7 +33,7 @@ DISTCLEAN_FILES = @DISTCLEAN_FILES@
 
 @SET_MAKE@
 
-SUBDIRS	= include lib sanei backend frontend doc tools po
+SUBDIRS	= include lib sanei backend frontend tools doc po
 
 DISTFILES = AUTHORS COPYING ChangeLog ChangeLog-1.0.0 ChangeLog-1.0.1 \
   ChangeLog-1.0.2 ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 \
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 2ae68ed02..baea38535 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -69,6 +69,9 @@ MAN2HTML= nroff -man |\
 EMACS   = xemacs
 WWW_PATH= /home/httpd/html/sane/
 
+HTML_PAGES = sane-backends.html sane-backends-external.html \
+             sane-mfgs.html sane-mfgs-external.html
+
 SUBDIRS = $(BACKDIRS) icons figs descriptions descriptions-external
 
 DISTFILES = Makefile.in backend-writing.txt descriptions.txt \
@@ -95,7 +98,7 @@ DISTFILES = Makefile.in backend-writing.txt descriptions.txt \
 .PHONY: all clean depend dist distclean html html-man install \
   install-mostang sane-html uninstall
 
-all: sane.ps $(MANPAGES)
+all: sane.ps $(MANPAGES) html-pages
 
 %.1 %.5 %.7: %.man
 	@sed -e 's|@DATADIR@|$(datadir)|g' \
@@ -138,7 +141,7 @@ install: all
 	    fi \
 	  done \
 	done
-	@-for doc in $(DOCS); do \
+	@-for doc in $(DOCS) $(HTML_PAGES); do \
 	    echo installing $${doc} in $(docdir)/$${doc}...; \
 	    $(INSTALL_DATA) $${doc} $(DESTDIR)$(docdir)/$${doc}; \
 	  done
@@ -211,8 +214,7 @@ sane-mfgs-external.html: $(wildcard descriptions-external/*.desc) \
 	   -t "SANE: Devices Supported by External Backends" -d 1 \
 	   > sane-mfgs-external.html
 
-html-pages: sane-backends.html sane-backends-external.html \
-	    sane-mfgs.html sane-mfgs-external.html
+html-pages: $(HTML_PAGES)
 
 html: html-pages html-man sane-html
 
diff --git a/doc/sane.man b/doc/sane.man
index b2def44f6..9b941e25c 100644
--- a/doc/sane.man
+++ b/doc/sane.man
@@ -1,4 +1,4 @@
-.TH sane 7 "17 Apr 2003" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH sane 7 "19 Apr 2003" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane
 
 .SH NAME
@@ -86,8 +86,9 @@ device lists contain information about the status of
 support for a specific device. If your scanner is not listed there (either
 supported or unsupported), please contact us. See section HOW CAN YOU HELP
 SANE for details. There are lists for specific releases of SANE, for the
-current develoment version and a search engine:
+current development version and a search engine:
 .IR http://www.mostang.com/sane/sane-supported-devices.html .
+The lists are also installed on your system at @DOCDIR@/.
 .TP
 .B SANE mailing list
 There is a mailing list for the purpose of discussing the SANE standard and