diff --git a/Include/pystate.h b/Include/pystate.h
index 4919d99..e2edf81 100644
--- a/Include/pystate.h
+++ b/Include/pystate.h
@@ -105,6 +105,8 @@ PyAPI_FUNC(void) PyInterpreterState_Clear(PyInterpreterState *);
 PyAPI_FUNC(void) PyInterpreterState_Delete(PyInterpreterState *);
 
 PyAPI_FUNC(PyThreadState *) PyThreadState_New(PyInterpreterState *);
+PyAPI_FUNC(PyThreadState *) PyThreadState_Prealloc(PyInterpreterState *);
+PyAPI_FUNC(void) PyThreadState_Init(PyThreadState *);
 PyAPI_FUNC(void) PyThreadState_Clear(PyThreadState *);
 PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *);
 #ifdef WITH_THREAD
diff --git a/Modules/threadmodule.c b/Modules/threadmodule.c
index 0e924cf..04fa902 100644
--- a/Modules/threadmodule.c
+++ b/Modules/threadmodule.c
@@ -428,6 +428,7 @@ struct bootstate {
 	PyObject *func;
 	PyObject *args;
 	PyObject *keyw;
+	PyThreadState *tstate;
 };
 
 static void
@@ -437,8 +438,9 @@ t_bootstrap(void *boot_raw)
 	PyThreadState *tstate;
 	PyObject *res;
 
-	tstate = PyThreadState_New(boot->interp);
-
+	tstate = boot->tstate;
+	tstate->thread_id = PyThread_get_thread_ident();
+	PyThreadState_Init(tstate);
 	PyEval_AcquireThread(tstate);
 	nb_threads++;
 	res = PyEval_CallObjectWithKeywords(
@@ -503,6 +505,11 @@ thread_PyThread_start_new_thread(PyObject *self, PyObject *fargs)
 	boot->func = func;
 	boot->args = args;
 	boot->keyw = keyw;
+	boot->tstate = PyThreadState_Prealloc(boot->interp);
+	if (boot->tstate == NULL) {
+		PyMem_DEL(boot);
+		return PyErr_NoMemory();
+	}
 	Py_INCREF(func);
 	Py_INCREF(args);
 	Py_XINCREF(keyw);
@@ -513,6 +520,7 @@ thread_PyThread_start_new_thread(PyObject *self, PyObject *fargs)
 		Py_DECREF(func);
 		Py_DECREF(args);
 		Py_XDECREF(keyw);
+		PyThreadState_Clear(boot->tstate);
 		PyMem_DEL(boot);
 		return NULL;
 	}
diff --git a/Python/pystate.c b/Python/pystate.c
index da417c1..8965f81 100644
--- a/Python/pystate.c
+++ b/Python/pystate.c
@@ -155,7 +155,7 @@ threadstate_getframe(PyThreadState *self)
 }
 
 PyThreadState *
-PyThreadState_New(PyInterpreterState *interp)
+_PyThreadState_New(PyInterpreterState *interp, int init)
 {
 	PyThreadState *tstate = (PyThreadState *)malloc(sizeof(PyThreadState));
 
@@ -193,9 +193,8 @@ PyThreadState_New(PyInterpreterState *interp)
 		tstate->c_profileobj = NULL;
 		tstate->c_traceobj = NULL;
 
-#ifdef WITH_THREAD
-		_PyGILState_NoteThreadState(tstate);
-#endif
+		if (init)
+			PyThreadState_Init(tstate);
 
 		HEAD_LOCK();
 		tstate->next = interp->tstate_head;
@@ -206,6 +205,25 @@ PyThreadState_New(PyInterpreterState *interp)
 	return tstate;
 }
 
+PyThreadState *
+PyThreadState_New(PyInterpreterState *interp)
+{
+	return _PyThreadState_New(interp, 1);
+}
+
+PyThreadState *
+PyThreadState_Prealloc(PyInterpreterState *interp)
+{
+	return _PyThreadState_New(interp, 0);
+}
+
+void
+PyThreadState_Init(PyThreadState *tstate)
+{
+#ifdef WITH_THREAD
+	_PyGILState_NoteThreadState(tstate);
+#endif
+}
 
 void
 PyThreadState_Clear(PyThreadState *tstate)
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 4f8417a..45ebbd7 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -238,6 +238,11 @@ Py_InitializeEx(int install_sigs)
 	if (install_sigs)
 		initsigs(); /* Signal handling stuff, including initintr() */
 		
+	/* auto-thread-state API, if available */
+#ifdef WITH_THREAD
+	_PyGILState_Init(interp, tstate);
+#endif /* WITH_THREAD */
+
 	/* Initialize warnings. */
 	_PyWarnings_Init();
 	if (PySys_HasWarnOptions()) {
@@ -251,11 +256,6 @@ Py_InitializeEx(int install_sigs)
 	if (!Py_NoSiteFlag)
 		initsite(); /* Module site */
 
-	/* auto-thread-state API, if available */
-#ifdef WITH_THREAD
-	_PyGILState_Init(interp, tstate);
-#endif /* WITH_THREAD */
-
 	if ((p = Py_GETENV("PYTHONIOENCODING")) && *p != '\0') {
 		p = icodeset = codeset = strdup(p);
 		free_codeset = 1;