Index: PC/os2emx/getpathp.c
===================================================================
--- PC/os2emx/getpathp.c	(revision 63377)
+++ PC/os2emx/getpathp.c	(working copy)
@@ -17,7 +17,7 @@
      is set, we believe it.  Otherwise, we use the path of our host .EXE's
      to try and locate our "landmark" (lib\\os.py) and deduce our home.
      - If we DO have a Python Home: The relevant sub-directories (Lib, 
-       plat-win, lib-tk, etc) are based on the Python Home
+       plat-win, etc) are based on the Python Home
      - If we DO NOT have a Python Home, the core Python Path is
        loaded from the registry.  This is the main PythonPath key, 
        and both HKLM and HKCU are combined to form the path)
Index: PC/os2vacpp/pyconfig.h
===================================================================
--- PC/os2vacpp/pyconfig.h	(revision 63377)
+++ PC/os2vacpp/pyconfig.h	(working copy)
@@ -66,7 +66,7 @@
 #define PYCC_VACPP  /* Define Indicator of C Compiler */
 
   /* Platform Filesystem */
-#define PYTHONPATH  ".;.\\lib;.\\lib\\plat-win;.\\lib\\lib-tk"
+#define PYTHONPATH  ".;.\\lib;.\\lib\\plat-win"
 #define DOSFILESYS  /* OS/2 Uses the DOS File Naming Conventions */
 /* #define IMPORT_8x3_NAMES (let's move up to long filenames) */
 
Index: PC/getpathp.c
===================================================================
--- PC/getpathp.c	(revision 63377)
+++ PC/getpathp.c	(working copy)
@@ -25,7 +25,7 @@
      is set, we believe it.  Otherwise, we use the path of our host .EXE's
      to try and locate our "landmark" (lib\\os.py) and deduce our home.
      - If we DO have a Python Home: The relevant sub-directories (Lib, 
-       plat-win, lib-tk, etc) are based on the Python Home
+       plat-win, etc) are based on the Python Home
      - If we DO NOT have a Python Home, the core Python Path is
        loaded from the registry.  This is the main PythonPath key, 
        and both HKLM and HKCU are combined to form the path)
Index: PC/pyconfig.h
===================================================================
--- PC/pyconfig.h	(revision 63377)
+++ PC/pyconfig.h	(working copy)
@@ -80,7 +80,7 @@
 #define MS_WIN32 /* only support win32 and greater. */
 #define MS_WINDOWS
 #ifndef PYTHONPATH
-#	define PYTHONPATH L".\\DLLs;.\\lib;.\\lib\\plat-win;.\\lib\\lib-tk"
+#	define PYTHONPATH L".\\DLLs;.\\lib;.\\lib\\plat-win"
 #endif
 #define NT_THREADS
 #define WITH_THREAD
Index: Makefile.pre.in
===================================================================
--- Makefile.pre.in	(revision 63377)
+++ Makefile.pre.in	(working copy)
@@ -808,7 +808,7 @@
 	plat-mac/lib-scriptpackages/SystemEvents \
 	plat-mac/lib-scriptpackages/Terminal 
 PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
-LIBSUBDIRS=	lib-tk site-packages test test/output test/data \
+LIBSUBDIRS=	tkinter site-packages test test/output test/data \
 		test/decimaltestdata \
 		encodings \
 		email email/mime email/test email/test/data \
Index: Modules/Setup.dist
===================================================================
--- Modules/Setup.dist	(revision 63377)
+++ Modules/Setup.dist	(working copy)
@@ -94,11 +94,7 @@
 MACHDEPPATH=:plat-$(MACHDEP)
 EXTRAMACHDEPPATH=
 
-# Path component for the Tkinter-related modules
-# The TKPATH variable is always enabled, to save you the effort.
-TKPATH=:lib-tk
-
-COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(EXTRAMACHDEPPATH)$(TKPATH)
+COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(EXTRAMACHDEPPATH)
 PYTHONPATH=$(COREPYTHONPATH)