Index: kitcreator
==================================================================
--- kitcreator
+++ kitcreator
@@ -33,11 +33,11 @@
 done
 
 # We're all done if we're in clean or distclean mode
 if [ "${mode}" = "clean" -o "${mode}" = "distclean" ]; then
 	rm -f tclkit-*
-	rm -f libtclkit-*.*
+	rm -f libtclkit*.*
 
 	exit 0
 fi
 
 # Add packages implied by the additional arguments
@@ -114,11 +114,9 @@
 
 if [ "${buildfailed}" != "0" ]; then
 	echo 'WARNING: Build is likely incomplete or failed.' >&2
 fi
 
-for kitdllfile in 'kitdll/build'/kitdll-*/libtclkit.*; do
-	cp "${kitdllfile}" "$(echo "${kitdllfile}" | sed "s@^.*/@@;s@\..*\$@-${TCLVERS}&@")" >/dev/null 2>/dev/null
-done
+cp 'kitdll/build'/kitdll-*/libtclkit* . >/dev/null 2>/dev/null
 cp 'kitsh/build'/kitsh-*/kit "tclkit-${TCLVERS}" >/dev/null 2>/dev/null
 
 exit "${buildfailed}"

Index: kitdll/build.sh
==================================================================
--- kitdll/build.sh
+++ kitdll/build.sh
@@ -102,11 +102,11 @@
 
 	echo "Running: ${MAKE:-make}"
 	${MAKE:-make} TCLSH_NATIVE="${TCLSH_NATIVE}" || exit 1
 
 	# Strip the KitDLL of debugging symbols, if possible
-	"${STRIP:-strip}" -g libtclkit.* >/dev/null 2>/dev/null
+	"${STRIP:-strip}" -g libtclkit* >/dev/null 2>/dev/null
 
 	exit 0
 ) || exit 1
 
 exit 0

Index: kitdll/buildsrc/kitdll-0.0/Makefile.in
==================================================================
--- kitdll/buildsrc/kitdll-0.0/Makefile.in
+++ kitdll/buildsrc/kitdll-0.0/Makefile.in
@@ -9,11 +9,11 @@
 OBJS = vfs_kitdll_data_tcl.o kitInit.o rechan.o pwb.o
 EXTRA_OBJS = @EXTRA_OBJS@
 TCLSH_NATIVE = tclsh
 
 # Default target
-all: libtclkit.@SHOBJEXT@
+all: libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@
 
 # Build targets
 ## VFS Build
 vfs_kitdll_data_tcl.o: vfs_kitdll_data_tcl.c
 vfs_kitdll_data_tcl.c: dir2c.tcl starpack.vfs vfs_kitdll_data.c
@@ -27,25 +27,25 @@
 ## Extensions
 rechan.o: rechan.c
 pwb.o: pwb.c
 
 ## DLL Build
-libtclkit.@SHOBJEXT@: $(OBJS) $(EXTRA_OBJS)
-	$(CC) $(CPPFLAGS) $(CFLAGS) -o libtclkit.@SHOBJEXT@ $(OBJS) $(EXTRA_OBJS) $(LDFLAGS) $(SHOBJLDFLAGS) -Wl,--whole-archive $(STATICLIBS) -Wl,--no-whole-archive $(LIBS)
+libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@: $(OBJS) $(EXTRA_OBJS)
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@ $(OBJS) $(EXTRA_OBJS) $(LDFLAGS) $(SHOBJLDFLAGS) -Wl,--whole-archive $(STATICLIBS) -Wl,--no-whole-archive $(LIBS)
 
 # Test driver
 tclsh.o: tclsh.c
-tclsh: tclsh.o $(EXTRA_OBJS) libtclkit.@SHOBJEXT@
-	$(CC) $(CPPFLAGS) $(CFLAGS) -o tclsh tclsh.o $(EXTRA_OBJS) -L. -ltclkit -Wl,-R,`pwd`
+tclsh: tclsh.o $(EXTRA_OBJS) libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o tclsh tclsh.o $(EXTRA_OBJS) -L. -ltclkit@KITDLL_LIB_VERSION@ -Wl,-R,`pwd`
 
 wish.o: wish.c
-wish: wish.o $(EXTRA_OBJS) libtclkit.@SHOBJEXT@
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(WISH_CFLAGS) -o wish wish.o $(EXTRA_OBJS) -L. -ltclkit -Wl,-R,`pwd`
+wish: wish.o $(EXTRA_OBJS) libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(WISH_CFLAGS) -o wish wish.o $(EXTRA_OBJS) -L. -ltclkit@KITDLL_LIB_VERSION@ -Wl,-R,`pwd`
 
 # Cleanup routeines
 clean:
-	rm -f libtclkit.@SHOBJEXT@
+	rm -f libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@
 	rm -f $(OBJS)
 	rm -f vfs_kitdll_data_tcl.c
 	rm -f vfs_kitdll.tcl.h
 	rm -f tclsh.o tclsh tclsh.exe
 	rm -f wish.o wish wish.exe

Index: kitdll/buildsrc/kitdll-0.0/aclocal.m4
==================================================================
--- kitdll/buildsrc/kitdll-0.0/aclocal.m4
+++ kitdll/buildsrc/kitdll-0.0/aclocal.m4
@@ -120,17 +120,19 @@
 		. "${tclconfigsh}"
 
 		CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic -I${tclconfigshdir}"
 		CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic -I${tclconfigshdir}"
 		LIBS="${LIBS} ${TCL_LIBS}"
+
+		KITDLL_LIB_VERSION=`echo "${TCL_VERSION}${TCL_PATCH_LEVEL}" | sed 's@\.@@g'`
 	fi
 
 	AC_SUBST(CFLAGS)
 	AC_SUBST(CPPFLAGS)
 	AC_SUBST(LIBS)
 
-	AC_SUBST(TCL_LIB_SPEC)
+	AC_SUBST(KITDLL_LIB_VERSION)
 
 	AC_MSG_RESULT([$tclconfigsh])
 ])
 
 AC_DEFUN(DC_DO_TK, [