--- kitInit.c.old	Fri Mar 24 23:18:07 2006
+++ kitInit.c	Tue May 08 22:05:56 2007
@@ -161,8 +161,8 @@
     "}\n"
     "uplevel #0 $s\n"
 #ifdef _WIN32
-    "package ifneeded dde 1.3.1 {load {} dde}\n"
-    "package ifneeded registry 1.1.5 {load {} registry}\n"
+    "package ifneeded dde 1.3 {load {} dde}\n"
+    "package ifneeded registry 1.2 {load {} registry}\n"
 #endif
 "}\n"
 "tclKitInit"
@@ -248,6 +248,11 @@
     TclSetPreInitScript(preInitCmd);
     if (Tcl_Init(interp) == TCL_ERROR)
         goto error;
+
+    /* Tcl8.5 default encoding hack */
+#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION >= 85
+    TclpSetInitialEncodings();
+#endif
 
 #ifdef KIT_INCLUDES_TK
 #ifdef _WIN32