diff --git a/Makefile.in b/Makefile.in
index 64a0ec9..ee1daf8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,7 +31,7 @@ manext = 1
 mandir = @mandir@/man$(manext)
 ### End of `configure' section###
 
-htmldir = $(prefix)/html
+htmldir = $(libdir)/scsh/doc/html
 
 # HP 9000 series, if you don't have gcc
 #   CC = cc
@@ -368,7 +368,7 @@ inst-doc:
 	for f in $(srcdir)/doc/scsh-manual/html/*.html 				\
 		$(srcdir)/doc/scsh-manual/html/*.gif 				\
 		$(srcdir)/doc/scsh-manual/html/*.css				\
-		$(srcdir)/doc/src/manual/*.html					\
+		$(srcdir)/doc/src/manual/*.html;				\
 		do $(INSTALL_DATA) $$f $(htmldir)/;		\
 	done
 
@@ -461,7 +461,7 @@ tags:
 # DISTFILES should include all sources.
 DISTFILES = README COPYING INSTALL RELEASE configure config.sub config.guess \
 		acconfig.h configure.in Makefile.in install-sh		\
-		doc/*.ps doc/*.txt doc/html/*.html 			\
+		doc/*.ps doc/*.txt					\
 		doc/src/*.tex doc/src/*.sty doc/src/manual.dvi 		\
 		doc/src/manual.ps					\
 		emacs/README build/*-version-number build/*.exec	\
@@ -489,6 +489,8 @@ DISTFILES = README COPYING INSTALL RELEASE configure config.sub config.guess \
 distname = $(RUNNABLE)-0.`cat build/minor-version-number`
 
 dist: build/initial.image
+	(cd doc/src && hyperlatex manual.tex) &&			\
+	(cd doc/scsh-manual && makeindex man && make man.ps && make html) && \
 	distname=$(distname) &&						\
 	distfile=$(distdir)/$$distname.tgz &&				\
 	if [ -d $(distdir) ] &&						\