diff --git a/.gitignore b/.gitignore
index e5d52b1..cbf11a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ pkgIndex.tcl
 *.o
 *.so
 tcllauncher
+doc/tcllauncher.n
diff --git a/ChangeLog b/ChangeLog
index b934c39..8516fd3 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
-$Id: ChangeLog,v 1.7 2008-11-18 21:48:24 karl Exp $
+ChangeLog
+
+2009-07-17 karl
+    * Add aclocal.m4 to create a rule for finding the path to dtplite and
+      modify configure.in to use that rule.
+
+    * Alter Makefile.in to have rules for building the tcllauncher.n
+      manpage using dtplite based on the tcllauncher.man Tcl doctools file.
 
 2009-06-11 karl
     * Deploy pidfile_* and daemonize functions.
diff --git a/Makefile.in b/Makefile.in
index 40523f0..7faca05 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -75,7 +75,7 @@ exec_prefix	= @exec_prefix@
 bindir		= @bindir@
 libdir		= @libdir@
 includedir	= @includedir@
-datarootdir     = @datarootdir@
+#datarootdir     = @datarootdir@
 datadir		= @datadir@
 mandir		= @mandir@
 
@@ -198,11 +198,21 @@ libraries:
 # 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=@DTPLITE@
+
+doc:	$(srcdir)/doc/tcllauncher.n
+
+$(srcdir)/doc/tcllauncher.n:	$(srcdir)/doc/tcllauncher.man
+	@if [ -n "$(DTPLITE)" -a -x "$(DTPLITE)" ]; then \
+	    echo "Building $@"; \
+	    $(DTPLITE) -o $@ nroff $(srcdir)/doc/tcllauncher.man ; \
+	fi
+
+tcllauncher.html:	$(srcdir)/doc/tcllauncher.man
+	@if [ -n "$(DTPLITE)" -a -x "$(DTPLITE)" ]; then \
+	    echo "Building $@"; \
+	    $(DTPLITE) -o $@ html $(srcdir)/doc/hdp.man ; \
+	fi
 
 install: all install-binaries install-libraries install-doc
 
diff --git a/aclocal.m4 b/aclocal.m4
index 0b05739..5f35c87 100755
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -7,3 +7,18 @@ builtin(include,tclconfig/tcl.m4)
 #
 # Add here whatever m4 macros you want to define for your package
 #
+
+#-------------------------------------------------------------------------
+# TEA_PROG_DTPLITE
+#
+#	Do we have a usable dtplite program to use in document generation?
+#
+# Results
+#	Sets up DTPLITE
+#
+#-------------------------------------------------------------------------
+
+AC_DEFUN(TEA_PROG_DTPLITE, [
+    AC_PATH_TOOL([DTPLITE], [dtplite], [:])
+])
+
diff --git a/configure.in b/configure.in
index b6c99c6..b264641 100755
--- a/configure.in
+++ b/configure.in
@@ -182,6 +182,12 @@ TEA_MAKE_LIB
 TEA_PROG_TCLSH
 #TEA_PROG_WISH
 
+# -------------------------------------------------------------------
+# Find a usable dtplite (from tcllib) to use in document generation.
+# -------------------------------------------------------------------
+
+TEA_PROG_DTPLITE
+
 # TCLLAUNCHER needs some stuff since it makes a tclsh-like executable
 # that isn't normally substituted.  Make configure substitute that stuff
 # too!
diff --git a/doc/tcllauncher.man b/doc/tcllauncher.man
index 3f8c180..ba28a91 100644
--- a/doc/tcllauncher.man
+++ b/doc/tcllauncher.man
@@ -2,7 +2,6 @@
 [moddesc   {Tcl application launcher for servers}]
 [copyright {2007-2009 FlightAware LLC (BSD Liscense)}]
 [titledesc {Tcl application launcher}]
-[category  {app launcher}]
 [description]
 [para]