Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -1,20 +1,30 @@
 CC = @CC@
 CFLAGS = @CFLAGS@ @SHOBJFLAGS@
-CPPFLAGS = @CPPFLAGS@ @DEFS@
+CPPFLAGS = @CPPFLAGS@ -I@srcdir@ @DEFS@
 LDFLAGS =
 SHOBJLDFLAGS = @SHOBJLDFLAGS@
 LIBS = @LIBS@
+INSTALL = @INSTALL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
+PACKAGE_INSTALL_DIR = $(TCL_PACKAGE_PATH)/tclpkcs11$(VERS)
+srcdir = @srcdir@
 
 all: tclpkcs11.@SHOBJEXT@
 
-tclpkcs11.o: tclpkcs11.c pkcs11.h pkcs11f.h pkcs11t.h
-	$(CC) $(CPPFLAGS) $(CFLAGS) -o tclpkcs11.o -c tclpkcs11.c
+tclpkcs11.o: $(srcdir)/tclpkcs11.c $(srcdir)/pkcs11.h $(srcdir)/pkcs11f.h $(srcdir)/pkcs11t.h
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o tclpkcs11.o -c $(srcdir)/tclpkcs11.c
 
 tclpkcs11.@SHOBJEXT@: tclpkcs11.o
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(SHOBJLDFLAGS) -o tclpkcs11.@SHOBJEXT@ tclpkcs11.o $(LIBS)
 
+install: tclpkcs11.@SHOBJEXT@ pkgIndex.tcl
+	$(INSTALL) -d "$(DESTDIR)$(PACKAGE_INSTALL_DIR)"
+	$(INSTALL) -m 0644 pkgIndex.tcl "$(DESTDIR)$(PACKAGE_INSTALL_DIR)"
+	$(INSTALL) -m 0755 tclpkcs11.@SHOBJEXT@ "$(DESTDIR)$(PACKAGE_INSTALL_DIR)"
+
 clean:
 	rm -f tclpkcs11.@SHOBJEXT@ tclpkcs11.o
 	rm -f tclpkcs11.@SHOBJEXT@.a tclpkcs11.@SHOBJEXT@.def
 
 distclean: clean
@@ -21,6 +31,6 @@
 	rm -rf autom4te.cache
 	rm -f config.log config.status
 	rm -f pkgIndex.tcl
 	rm -f Makefile
 
-.PHONY: all clean distclean
+.PHONY: all install clean distclean

Index: aclocal/tcl.m4
==================================================================
--- aclocal/tcl.m4
+++ aclocal/tcl.m4
@@ -37,10 +37,11 @@
 	if test -f "$TCLCONFIGPATH/tclConfig.sh"; then
 		. "$TCLCONFIGPATH/tclConfig.sh"
 	else
 		AC_MSG_ERROR([unable to load tclConfig.sh])
 	fi
+
 
 	AC_MSG_RESULT([found])
 ])
 
 AC_DEFUN(TCLEXT_INIT, [
@@ -65,8 +66,11 @@
 	TCL_INCLUDE_SPEC="`eval echo "${TCL_INCLUDE_SPEC}"`"
 
 	CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC}"
 	CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC}"
 	DEFS="${DEFS} ${TCL_DEFS}"
+
+	dnl Needed for package installation
+	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.6"
+VERS="0.9.7"
 
 # 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}