Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -208,15 +208,36 @@
 # Your doc target should differentiate from doc builds (by the developer)
 # and doc installs (see install-doc), which just install the docs on the
 # end user machine when building from source.
 #========================================================================
 
-doc:
-	@echo "If you have documentation to create, place the commands to"
-	@echo "build the docs in the 'doc:' target.  For example:"
-	@echo "        xml2nroff sample.xml > sample.n"
-	@echo "        xml2html sample.xml > sample.html"
+DTPLITE=$(TCLSH) @DTPLITE@
+
+doc: make-docs-n make-docs-html
+
+make-docs-n: doc/tls.man
+	@echo "make nroff documentation"
+	@if [ -n "$(DTPLITE)" -a -x "$(DTPLITE)" ]; then \
+	    $(DTPLITE) -o doc/tls.n nroff doc/tls.man ; \
+	fi
+
+make-docs-html: doc/tls.man
+	@echo "make HTML documentation"
+	@if [ -n "$(DTPLITE)" -a -x "$(DTPLITE)" ]; then \
+	    $(DTPLITE) -o doc/tls.html html doc/tls.man ; \
+	fi
+
+make-docs: doc/tls.man
+	@echo "make documentation"
+	@if [ -n "$(DTPLITE)" -a -x "$(DTPLITE)" ]; then \
+	    $(DTPLITE) -o doc nroff doc ; \
+	    $(DTPLITE) -o doc html doc ; \
+	fi
+
+#========================================================================
+# Install targets
+#========================================================================
 
 install: all install-binaries install-libraries install-doc-n install-doc-html
 
 install-binaries: binaries install-lib-binaries install-bin-binaries
 
@@ -236,21 +257,21 @@
 #========================================================================
 # Install documentation.  Unix manpages should go in the $(mandir)
 # directory.
 #========================================================================
 
-install-doc-html: doc
+install-doc-html: make-docs-html
 	@$(INSTALL_DATA_DIR) "$(DESTDIR)$(pkglibdir)/html"
 	@echo "Installing HTML documentation in $(DESTDIR)$(pkglibdir)/html"
 	@list='doc/*.html'; for i in $$list; do \
 	    if test -f $$i ; then \
 		echo "Installing $$i"; \
 		$(INSTALL_DATA) $$i "$(DESTDIR)$(pkglibdir)/html"; \
 	    fi; \
 	done
 
-install-doc-n: doc
+install-doc-n: make-docs-n
 	@$(INSTALL_DATA_DIR) "$(DESTDIR)$(mandir)/mann"
 	@echo "Installing nroff documentation in $(DESTDIR)$(mandir)/mann"
 	@list='doc/*.n'; for i in $$list; do \
 	    if test -f $$i ; then \
 		if test -f "$(DESTDIR)$(mandir)/mann/Tcl.n.gz" -o \

Index: doc/tls.html
==================================================================
--- doc/tls.html
+++ doc/tls.html
@@ -879,13 +879,15 @@
 
 <hr>
 
 <h3><a name="KEYWORDS">KEYWORDS</a></h3>
 
-<p><strong>ssl</strong>, <strong>tls</strong>, <strong>socket</strong>,
-<strong>certificate</strong>, <strong>https</strong>
-
+<p><strong>tls</strong>, <strong>I/O</strong>, <strong>IP Address</strong>, <strong>OpenSSL</strong>
+<strong>SSL</strong>, <strong>TCP</strong>, <strong>TLS</strong>, <strong>asynchronous I/O</strong>,
+<strong>bind</strong>, <strong>certificate</strong>, <strong>channel</strong>, <strong>connection</strong>, 
+<strong>domain name</strong>, <strong>host</strong>,<strong>https</strong>, <strong>network address</strong>,
+<strong>network</strong>, <strong>socket</strong>, <strong>TclTLS</strong>
 <hr>
 
 <pre>
 Copyright &copy; 1999 Matt Newman
 Copyright &copy; 2004 Starfish Systems

Index: win/makefile.vc
==================================================================
--- win/makefile.vc
+++ win/makefile.vc
@@ -62,10 +62,30 @@
 .SUFFIXES: .c .obj .res .man
 
 #---------------------------------------------------------------------
 # Project specific targets
 #---------------------------------------------------------------------
+
+# Implicit rule to generate html from man files
+# NOTE: this requires doctools from tcllib hence it is not intended
+# to be run during install. Rather, use it to generate a new version
+# of HTML docs to be stored in the repository.
+make-docs-html:
+	"$(_INSTALLDIR)\..\bin\tclsh.exe" "$(_INSTALLDIR)\..\bin\dtplite.tcl" \
+	    -o "$(ROOT)\doc\$(PROJECT).html" html "$(ROOT)\doc\$(PROJECT).man"
+
+make-docs-n:
+	"$(_INSTALLDIR)\..\bin\tclsh.exe" "$(_INSTALLDIR)\..\bin\dtplite.tcl" \
+	    -o "$(ROOT)\doc\$(PROJECT).n" nroff "$(ROOT)\doc\$(PROJECT).man"
+
+make-docs:
+	"$(_INSTALLDIR)\..\bin\tclsh.exe" "$(_INSTALLDIR)\..\bin\dtplite.tcl" \
+	    -o "$DOCDIR" html "$(ROOT)\doc"
+	"$(_INSTALLDIR)\..\bin\tclsh.exe" "$(_INSTALLDIR)\..\bin\dtplite.tcl" \
+	    -o "$DOCDIR" nroff "$(ROOT)\doc"
+
+docs: make-docs-n make-docs-html 
 
 all: setup default-target
 
 clean: default-clean