Index: Python/pythonrun.c
===================================================================
--- Python/pythonrun.c	(revision 66234)
+++ Python/pythonrun.c	(working copy)
@@ -239,11 +239,11 @@
 	}
 
 	initmain(); /* Module __main__ */
-	if (!Py_NoSiteFlag)
-		initsite(); /* Module site */
 	if (initstdio() < 0)
 		Py_FatalError(
 		    "Py_Initialize: can't initialize sys standard streams");
+	if (!Py_NoSiteFlag)
+		initsite(); /* Module site */
 
 	/* auto-thread-state API, if available */
 #ifdef WITH_THREAD
Index: Modules/Setup.dist
===================================================================
--- Modules/Setup.dist	(revision 66234)
+++ Modules/Setup.dist	(working copy)
@@ -113,6 +113,8 @@
 _codecs _codecsmodule.c		# access to the builtin codecs and codec registry
 _fileio _fileio.c		# Standard I/O baseline
 _weakref _weakref.c		# weak references
+_bytesio _bytesio.c		# For Lib/io.py
+_stringio _stringio.c		# For Lib/io.py
 
 # The zipimport module is always imported at startup. Having it as a
 # builtin module avoids some bootstrapping problems and reduces overhead.