Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -5,11 +5,11 @@
 SHOBJLDFLAGS = @SHOBJLDFLAGS@
 LIBS = @LIBS@
 INSTALL = @INSTALL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
-PACKAGE_INSTALL_DIR = $(TCL_PACKAGE_PATH)/tclpkcs11$(VERS)
+PACKAGE_INSTALL_DIR = $(TCL_PACKAGE_PATH)/tclpkcs11$(PACKAGE_VERSION)
 srcdir = @srcdir@
 
 all: tclpkcs11.@SHOBJEXT@
 
 tclpkcs11.o: $(srcdir)/tclpkcs11.c $(srcdir)/pkcs11.h $(srcdir)/pkcs11f.h $(srcdir)/pkcs11t.h

Index: aclocal/tcl.m4
==================================================================
--- aclocal/tcl.m4
+++ aclocal/tcl.m4
@@ -68,9 +68,10 @@
 	CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC}"
 	CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC}"
 	DEFS="${DEFS} ${TCL_DEFS}"
 
 	dnl Needed for package installation
+	TCL_PACKAGE_PATH="`echo "${TCL_PACKAGE_PATH}" | sed 's@  *$''@@'`"
 	AC_SUBST(TCL_PACKAGE_PATH)
 
 	AC_SUBST(LIBS)
 ])

Index: build/makearch.info
==================================================================
--- build/makearch.info
+++ build/makearch.info
@@ -14,11 +14,11 @@
 # each time a "makearch" is done.
 #
 # If @@SVNLCR@@ is used anywhere in this version number, it will be
 # replaced with the highest last-changed-rev from the output of
 #   svn info -R    (or 0)
-VERS="0.9.7"
+VERS="0.9.8"
 
 # Space sperated list of documents, if they exist, they will be
 # prefixed with the contents of the DOC_HDR file and substitution
 # will occur:
 #     @@UTIL@@ becomes the utility name ${UTIL}