Index: Makefile.in
==================================================================
--- Makefile.in
+++ Makefile.in
@@ -88,11 +88,17 @@
 	$(srcdir)/patch-headers.sh "$(DESTDIR)$(PACKAGE_INSTALL_DIR)/include"
 
 test:
 	rm -rf __TMP__
 	$(MAKE) install tcllibdir=$(shell pwd)/__TMP__
-	-if [ "$(PACKAGE_VERSION)" = '@@VERS@@' ]; then cd __TMP__/* && sed -i 's|@@VERS@@|0.0.0.11|g' tcc4tcl.@SHOBJEXT@ pkgIndex.tcl; fi
+	-if [ "$(PACKAGE_VERSION)" = '@@VERS@@' ]; then cd __TMP__/* && ( \
+		for file in tcc4tcl.tcl pkgIndex.tcl; do \
+			sed 's/@@VERS@@/0.0/g' "$${file}" > "$${file}.new"; \
+			cat "$${file}.new" > "$${file}"; \
+			rm -f "$${file}.new"; \
+		done \
+	); fi
 	$(TCLSH) $(srcdir)/test __TMP__
 	echo Tests Completed OK > TEST-STATUS
 	rm -rf __TMP__
 
 clean:

Index: build/makearch.info
==================================================================
--- build/makearch.info
+++ build/makearch.info
@@ -28,11 +28,11 @@
 DOCS="README"
 DOC_HDR="HEADER"
 
 # These files follow the same convention as DOCS, but don't have the header
 # tacked onto them.
-UPDATE_VARS="configure.ac configure"
+UPDATE_VARS="configure.ac configure tcc4tcl.tcl"
 
 # This script is executed immediately after copying the files
 # to a temp directory to attempt to compile
 BEFORE="build/pre.sh"
 

Index: tcc4tcl.c
==================================================================
--- tcc4tcl.c
+++ tcc4tcl.c
@@ -284,10 +284,9 @@
 	if (Tcl_InitStubs(interp, "8.4" , 0) == 0L) {
 		return TCL_ERROR;
 	}
 #endif
 
-	Tcl_CreateObjCommand(interp, PACKAGE_NAME, Tcc4tclCreateCmd, NULL, NULL);
-	Tcl_PkgProvide(interp, PACKAGE_NAME, PACKAGE_VERSION);
+	Tcl_CreateObjCommand(interp, "tcc4tcl", Tcc4tclCreateCmd, NULL, NULL);
 
 	return TCL_OK;
 }

Index: tcc4tcl.tcl
==================================================================
--- tcc4tcl.tcl
+++ tcc4tcl.tcl
@@ -393,5 +393,7 @@
 
 	return [list $code $cbody $wname]
 }
 
 namespace eval tcc4tcl {namespace export cproc new}
+
+package provide tcc4tcl "@@VERS@@"