Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -16,21 +16,21 @@
 INSTALL_DATA = @INSTALL_DATA@
 VPATH = @srcdir@
 
 all: @EXTENSION_TARGET@
 
-ifeq (@TCLEXT_BUILD@,shared)
+@EXTENSION_TARGET@: @TCLEXT_BUILD@-@EXTENSION_TARGET@
+	mv @TCLEXT_BUILD@-@EXTENSION_TARGET@ @EXTENSION_TARGET@
+
 # The shared object target
-@EXTENSION_TARGET@: tls.o tlsBIO.o tlsIO.o tlsX509.o Makefile
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o tcltls.@SHOBJEXT@ tls.o tlsBIO.o tlsIO.o tlsX509.o $(LIBS)
-else
+shared-@EXTENSION_TARGET@: tls.o tlsBIO.o tlsIO.o tlsX509.o Makefile
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o shared-@EXTENSION_TARGET@ tls.o tlsBIO.o tlsIO.o tlsX509.o $(LIBS)
+
 # The static target
-@EXTENSION_TARGET@: tls.o tlsBIO.o tlsIO.o tlsX509.o Makefile
-	$(AR) rcu tcltls.a.new tls.o tlsBIO.o tlsIO.o tlsX509.o
-	-$(RANLIB) tcltls.a.new
-	mv tcltls.a.new tcltls.a
-endif
+static-@EXTENSION_TARGET@: tls.o tlsBIO.o tlsIO.o tlsX509.o Makefile
+	$(AR) rcu static-@EXTENSION_TARGET@ tls.o tlsBIO.o tlsIO.o tlsX509.o
+	-$(RANLIB) static-@EXTENSION_TARGET@
 
 # Dependencies for all our targets
 tls.o: @srcdir@/tls.c @srcdir@/tlsInt.h @srcdir@/tclOpts.h tls.tcl.h dh_params.h Makefile
 tlsBIO.o: @srcdir@/tlsBIO.c @srcdir@/tlsInt.h Makefile
 tlsIO.o: @srcdir@/tlsIO.c @srcdir@/tlsInt.h Makefile
@@ -72,13 +72,12 @@
 	@TCLSH_PROG@ @srcdir@/tests/all.tcl $(TESTFLAGS) -load "lappend auto_path $(shell pwd)"
 
 # Clean the local build directory for rebuild against the same configuration
 clean:
 	rm -f tls.o tlsBIO.o tlsIO.o tlsX509.o
-	rm -f tcltls.@SHOBJEXT@
-	rm -f tcltls.@SHOBJEXT@.a tcltls.@SHOBJEXT@.def
-	rm -f tcltls.a.new tcltls.a
+	rm -f @EXTENSION_TARGET@ shared-@EXTENSION_TARGET@ static-@EXTENSION_TARGET@
+	rm -f shared-@EXTENSION_TARGET@.def shared-@EXTENSION_TARGET@.lib
 	rm -f tls.tcl.h tls.tcl.h.new.1 tls.tcl.h.new.2
 
 # Clean the local build directory back to what it was after unpacking the
 # distribution tarball
 distclean: clean

Index: build/update-wiki-docs
==================================================================
--- build/update-wiki-docs
+++ build/update-wiki-docs
@@ -3,14 +3,14 @@
 version="$1"
 
 cd "$(dirname "$(which "$0")")/.." || exit 1
 
 if [ -z "${version}" ]; then
-	version="$(cat configure.in | grep AC_INIT | head -1 | sed 's@^AC_INIT([^,]*, *@@;s@,.*$@@;s@ *)$@@')"
+	version="$(cat configure.ac | grep AC_INIT | head -1 | sed 's@^AC_INIT([^,]*, *@@;s@,.*$@@;s@ *)$@@')"
 fi
 
-newBody="$(cat tls.htm  | sed '/<\/body>/,$ d;0,/<body[ >]/ d;/<!--/,/-->/ d' | sed 's/@@VERS@@/'"${version}"'/g' | grep -iv '^<!doctype')"
+newBody="$(cat tls.htm | sed 's@\[@<nowiki>[</nowiki>@g' | sed '/<\/body>/,$ d;0,/<body[ >]/ d;/<!--/,/-->/ d' | sed 's/@@VERS@@/'"${version}"'/g' | grep -iv '^<!doctype')"
 oldBody="$(fossil wiki export 'Documentation')"
 
 if [ "${newBody}" != "${oldBody}" ]; then
 	echo "${newBody}" | fossil wiki commit 'Documentation'
 fi

Index: pkgIndex.tcl.in
==================================================================
--- pkgIndex.tcl.in
+++ pkgIndex.tcl.in
@@ -1,16 +1,16 @@
 if {[package vsatisfies [package present Tcl] 8.5]} {
 	package ifneeded tls @PACKAGE_VERSION@ [list apply {{dir} {
 		if {{@TCLEXT_BUILD@} eq "static"} {
 			load {} Tls
 		} else {
-			load [file join $dir tcltls.@SHOBJEXT@] Tls
+			load [file join $dir @EXTENSION_TARGET@] Tls
 		}
 
 		set tlsTclInitScript [file join $dir tls.tcl]
 		if {[file exists $tlsTclInitScript]} {
 			source $tlsTclInitScript
 		}
 	}} $dir]
 } elseif {[package vsatisfies [package present Tcl] 8.4]} {
-	package ifneeded tls @PACKAGE_VERSION@ [list load [file join $dir tcltls.@SHOBJEXT@] Tls]
+	package ifneeded tls @PACKAGE_VERSION@ [list load [file join $dir @EXTENSION_TARGET@] Tls]
 }

Index: tls.htm
==================================================================
--- tls.htm
+++ tls.htm
@@ -145,10 +145,12 @@
         <dt><strong>cipher</strong> <em>cipher</em></dt>
         <dd>The current cipher in use between the client and
             server channels.</dd>
         <dt><strong>sbits</strong> <em>n</em></dt>
         <dd>The number of bits used for the session key.</dd>
+        <dt><strong>certificate</strong> <em>n</em></dt>
+        <dd>The PEM encoded certificate.</dd>
     </dl>
 </blockquote>
 
 <dl>
     <dt><a name="tls::import"><b>tls::import </b><i>channel