diff --git a/Makefile.in b/Makefile.in
index 0a04630..f6c2734 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,13 +24,14 @@ RANLIB	= @RANLIB@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+bindir = @bindir@
+libdir = @libdir@
+incdir = @includedir@
+manext = 1
+mandir = @mandir@/man$(manext)
 ### End of `configure' section###
 
-bindir = $(exec_prefix)/bin
-libdir = $(exec_prefix)/lib
-incdir = $(exec_prefix)/include
-manext = 1
-mandir = $(prefix)/man/man$(manext)
+htmldir = $(prefix)/html
 
 # HP 9000 series, if you don't have gcc
 #   CC = cc
@@ -361,8 +362,9 @@ inst-doc:
 	done &&									\
 	for f in $(srcdir)/doc/scsh-manual/html/*.html 				\
 		$(srcdir)/doc/scsh-manual/html/*.gif 				\
-		$(srcdir)/doc/scsh-manual/html/*.css;				\
-		do $(INSTALL_DATA) $$f $(LIB)/doc/scsh-manual/html/;		\
+		$(srcdir)/doc/scsh-manual/html/*.css				\
+		$(srcdir)/doc/html/*.html;					\
+		do $(INSTALL_DATA) $$f $(htmldir)/;		\
 	done
 
 inst-script:
@@ -384,14 +386,14 @@ go:
 	chmod +x $@
 
 dirs:
-	for dir in $(libdir) $(bindir) $(incdir) $(LIB) $(mandir); do	\
+	for dir in $(libdir) $(bindir) $(incdir) $(LIB) $(mandir) $(htmldir); do\
 		{ mkdir -p $$dir && [ -w $$dir ]; } || {		\
 			echo "$$dir not a writable directory" >&2;	\
 			exit 1;						\
 	}								\
 	done &&								\
 	for dir in								\
-		rts env big opt misc link scsh doc/scsh-manual/html cig;	\
+		rts env big opt misc link scsh doc/scsh-manual cig;	\
 		do								\
 		{ mkdir -p $(LIB)/$$dir && [ -w $(LIB)/$$dir ]; } || {		\
 			echo "$(LIB)/$$dir not a writable directory" >&2; 	\
@@ -867,13 +869,11 @@ install-scsh: scsh install-scsh-image
 	for f in $(srcdir)/scsh/*.scm $(srcdir)/scsh/*/*.scm; \
 	    do $(INSTALL_DATA) $$f $(LIB)/scsh/; done
 
-install-scsh-image: 
-	rm -f  '/tmp/scsh.image' &&                                     \
+install-scsh-image: $(VM) scsh/scsh.image
 	(	echo ',translate =scheme48 $(LIB)';			\
-		echo '(dump-scsh "/tmp/scsh.image")';			\
+		echo '(dump-scsh "$(LIB)/scsh.image")';			\
 		echo ',exit';						\
-	) | ./$(VM) -i scsh/scsh.image	&&	                        \
-	$(INSTALL_DATA) /tmp/scsh.image $(LIB)/scsh.image
+	) | ./$(VM) -i scsh/scsh.image	
 
 clean-scsh:
 	$(RM) scsh/*.o scsh/rx/*.o scsh/machine/*.o