--- tcl8.5.0/unix/Makefile.in.make	2007-12-19 22:50:13.000000000 +0100
+++ tcl8.5.0/unix/Makefile.in	2007-12-20 11:11:07.000000000 +0100
@@ -731,8 +731,8 @@ install-binaries: binaries
 	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
 			$(LIB_INSTALL_DIR)/$(TCL_EXP_FILE); \
 	    fi
-	@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)"
-	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION)
+	@echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh"
+	@$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh
 	@echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/"
 	@$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh
 	@if test "$(STUB_LIB_FILE)" != "" ; then \
@@ -783,7 +783,7 @@ install-libraries: libraries $(INSTALL_T
 	    $(INSTALL_DATA) $$j $(SCRIPT_INSTALL_DIR)/http1.0; \
 	    done;
 	@echo "Installing package http 2.5.3 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/http-2.5.3.tm;
+	@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/http-2.5.3.tm;
 	@echo "Installing library opt0.4 directory";
 	@for j in $(TOP_DIR)/library/opt/*.tcl ; \
 	    do \
@@ -795,9 +795,9 @@ install-libraries: libraries $(INSTALL_T
 	@$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.3.0.tm;
 
 	@echo "Installing package platform 1.0.3 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform-1.0.3.tm;
+	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/platform-1.0.3.tm;
 	@echo "Installing package platform::shell 1.1.3 as a Tcl Module";
-	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform/shell-1.1.3.tm;
+	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/platform/shell-1.1.3.tm;
 
 	@echo "Installing library encoding directory";
 	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
@@ -1750,21 +1750,41 @@ allpatch: dist
 # tk8.* up two directories from the TOOL_DIR.
 #
 
-html: tclsh
-	$(BUILD_HTML)
-	@EXTRA_BUILD_HTML@
-html-tcl: tclsh
-	$(BUILD_HTML) --tcl
-	@EXTRA_BUILD_HTML@
-html-tk: tclsh
-	$(BUILD_HTML) --tk
-	@EXTRA_BUILD_HTML@
-
-BUILD_HTML = \
-	@@LD_LIBRARY_PATH_VAR@=`pwd`:$${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \
-	TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
-	./tclsh $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) \
-		--srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS)
+html:
+	echo "Building html" \
+	echo "adresar $(HTML_DIR)"; \
+	mkdir -p ../htmll; \
+	mkdir -p ../html; \
+	mkdir -p ../html/TclCmd;
+	mkdir -p ../html/TclLib;
+	mkdir -p ../html/TkCmd;
+	mkdir -p ../html/TkLib;
+	mkdir -p ../html/UserCmd;
+	cd ..; \
+	for i in `ls doc`; do \
+	j=`echo $$i | sed s/[0-9n]$$/htm/`; \
+	man2html doc/$$i > htmll/$$j 2> /dev/null ; \
+	done;
+	for i in `ls ../../tk8.5b1/doc`; do \
+	j=`echo $$i | sed s/[0-9n]$$/htm/`; \
+	man2html ../../tk8.5b1/doc/$$i > ../htmll/$$j 2> /dev/null; \
+	done;
+	for i in `cat lst/tclcmd_list`; do \
+	cp ../htmll/$$i ../html/TclCmd/$$i; \
+	done;
+	for i in `cat lst/tcllib_list`; do \
+	cp ../htmll/$$i ../html/TclLib/$$i; \
+	done;
+	for i in `cat lst/tkcmd_list`; do \
+	cp ../htmll/$$i ../html/TkCmd/$$i; \
+	done;
+	for i in `cat lst/tklib_list`; do \
+	cp ../htmll/$$i ../html/TkLib/$$i; \
+	done;
+	for i in `cat lst/usercmd_list`; do \
+	cp ../htmll/$$i ../html/UserCmd/$$i; \
+	done;
+	rm -r ../htmll;
 
 #
 # Targets to build Solaris package of the distribution for the current