diff --git a/.gitignore b/.gitignore
index 04839e6..0b45ba0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ autom4te.cache
 *.o
 config.*
 doc/*.html
+doc/*.man
 doc/*.n
 *.dylib
 pkgIndex.tcl
diff --git a/configure b/configure
index fe61f3a..73eaca8 100755
--- a/configure
+++ b/configure
@@ -7655,7 +7655,7 @@ $as_echo "${TCLSH_PROG}" >&6; }
 # which require substituting th AC variables in.  Include these here.
 #--------------------------------------------------------------------
 
-ac_config_files="$ac_config_files Makefile pkgIndex.tcl"
+ac_config_files="$ac_config_files Makefile pkgIndex.tcl doc/bonjour.man"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -8367,6 +8367,7 @@ do
   case $ac_config_target in
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES pkgIndex.tcl" ;;
+    "doc/bonjour.man") CONFIG_FILES="$CONFIG_FILES doc/bonjour.man" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/configure.in b/configure.in
index 1e01aa1..18c4d70 100755
--- a/configure.in
+++ b/configure.in
@@ -187,4 +187,4 @@ TEA_PROG_TCLSH
 # which require substituting th AC variables in.  Include these here.
 #--------------------------------------------------------------------
 
-AC_OUTPUT([Makefile pkgIndex.tcl])
+AC_OUTPUT([Makefile pkgIndex.tcl doc/bonjour.man])
diff --git a/doc/bonjour.man b/doc/bonjour.man.in
similarity index 96%
rename from doc/bonjour.man
rename to doc/bonjour.man.in
index e159e98..e58f9a8 100644
--- a/doc/bonjour.man
+++ b/doc/bonjour.man.in
@@ -1,9 +1,9 @@
-[manpage_begin bonjour n 1.0]
+[manpage_begin @PACKAGE_NAME@ n @PACKAGE_VERSION@]
 [copyright {2010 Blair Kitchen <blair@the-blair.com>}]
 [moddesc {Networking}]
 [moddesc {Bonjour Library}]
 [require Tcl 8.5]
-[require bonjour [opt 1.0]]
+[require @PACKAGE_NAME@ [opt @PACKAGE_VERSION@]]
 [description]
 
 [para]