diff --git a/mingw-w64-python2/0005-MINGW.patch b/mingw-w64-python2/0005-MINGW.patch
new file mode 100644
index 0000000000..2771670b51
--- /dev/null
+++ b/mingw-w64-python2/0005-MINGW.patch
@@ -0,0 +1,2749 @@
+diff -urN a/configure.ac b/configure.ac
+--- a/configure.ac	2013-05-12 04:32:54.000000000 +0100
++++ b/configure.ac	2013-05-17 23:57:26.928332564 +0100
+@@ -318,6 +318,9 @@
+ 	*-*-cygwin*)
+ 		ac_sys_system=Cygwin
+ 		;;
++	*-*-mingw*)
++		ac_sys_system=MinGW
++		;;
+ 	*)
+ 		# for now, limit cross builds to known configurations
+ 		MACHDEP="unknown"
+@@ -345,6 +348,7 @@
+ 	darwin*) MACHDEP="darwin";;
+ 	atheos*) MACHDEP="atheos";;
+         irix646) MACHDEP="irix6";;
++	mingw*) MACHDEP="win32";;
+ 	'')	MACHDEP="unknown";;
+     esac
+ fi
+@@ -361,7 +365,7 @@
+ 			_host_cpu=$host_cpu
+ 		esac
+ 		;;
+-	*-*-cygwin*)
++	*-*-cygwin*|*-*-mingw*)
+ 		_host_cpu=
+ 		;;
+ 	*)
+@@ -489,6 +493,16 @@
+ fi
+ AC_MSG_RESULT($MACHDEP)
+ 
++AC_MSG_CHECKING([for init system calls])
++AC_SUBST(INITSYS)
++case $host in
++  # FIXME: May configure lack detection for os2 host system ?
++  #?#*-*-os2*)	INITSYS=os2;;
++  *-*-mingw*)	INITSYS=nt;;
++  *)		INITSYS=posix;;
++esac
++AC_MSG_RESULT([$INITSYS])
++
+ # And add extra plat-mac for darwin
+ AC_SUBST(EXTRAPLATDIR)
+ AC_SUBST(EXTRAMACHDEPPATH)
+@@ -825,6 +839,10 @@
+   *)
+     enable_shared="no";;
+   esac
++  case $host in
++  *-*-mingw*)
++    enable_shared="yes";;
++  esac
+ fi
+ AC_MSG_RESULT($enable_shared)
+ 
+@@ -926,6 +944,14 @@
+ 	;;
+ 
+   esac
++  case $host in
++    *-*-mingw*)
++          LDLIBRARY='libpython$(VERSION).dll.a'
++          DLLLIBRARY='libpython$(VERSION).dll'
++          dnl setup.py add it for mingw host
++          dnl BLDLIBRARY='-L. -lpython$(VERSION)'
++          ;;
++  esac
+ else # shared is disabled
+   case $ac_sys_system in
+     CYGWIN*)
+@@ -933,6 +959,10 @@
+           LDLIBRARY='libpython$(VERSION).dll.a'
+           ;;
+   esac
++  case $host in
++    *-*-mingw*)
++          LDLIBRARY='libpython$(VERSION).a';;
++  esac
+ fi
+ 
+ if test "$cross_compiling" = yes; then
+@@ -1012,6 +1042,8 @@
+ 	esac
+ fi
+ 
++dnl TODO: to move --with-pydebug earlier in script and to group
++dnl debug related statements togeder (if posible)
+ # Check for --with-pydebug
+ AC_MSG_CHECKING(for --with-pydebug)
+ AC_ARG_WITH(pydebug, 
+@@ -1026,6 +1058,29 @@
+ else AC_MSG_RESULT(no); Py_DEBUG='false'
+ fi],
+ [AC_MSG_RESULT(no)])
++# FIXME: We define BUILDEXEEXT and LDLIBRARY above but:
++#  For debug versions MSVC build prepend suffix by '_d'.
++#  If we support this convention we may modify distutils(TODO).
++#  To support different build directories is good "--with-pydebug"
++#  to be earlier in the script(why i wrote this?).
++if test "x$Py_DEBUG" = xtrue; then
++  case $host in
++    dnl TODO: This is good to be where we define LDLIBRARY
++    dnl but --with-pydebug is defined too late in the script.
++    # Since Makefile.pre.in may isn't suitable for now we will not
++    # change LDLIBRARY.
++    *-*-mingw*)
++      BUILDEXEEXT=_d$BUILDEXEEXT
++      if test x$enable_shared = xyes; then
++        #LDLIBRARY='libpython$(VERSION)_d.dll.a'
++        DLLLIBRARY='libpython$(VERSION)_d.dll'
++      else # shared is disabled
++        #LDLIBRARY='libpython$(VERSION)_d.dll.a';;
++        :
++      fi
++      ;;
++  esac
++fi
+ 
+ # XXX Shouldn't the code above that fiddles with BASECFLAGS and OPT be
+ # merged with this chunk of code?
+@@ -1042,6 +1097,8 @@
+ 
+ # tweak OPT based on compiler and platform, only if the user didn't set
+ # it on the command line
++# NOTE: If user set OPT at this point script ignore all previously set
++# options (not important - BeOS is depricated for python 2.6+).
+ AC_SUBST(OPT)
+ if test "${OPT-unset}" = "unset"
+ then
+@@ -1253,8 +1310,15 @@
+     ;;
+ esac
+ 
++dnl NOTE: although Py_DEBUG is set earlier in the script we can't move
++dnl before "# tweak OPT based on compiler" - if user specify environment
++dnl variable OPT we will lost our settings!!!
++dnl FIXME: why script add debug definition to OPT instead to BASECFLAGS?
+ if test "$Py_DEBUG" = 'true'; then
+-  :
++  case $host in
++    dnl Same as in PC/pyconfig.h but order in opposite(Py_DEBUG=>-D_DEBUG).
++    *-*-mingw*) OPT="-D_DEBUG $OPT";;
++  esac
+ else
+   OPT="-DNDEBUG $OPT"
+ fi
+@@ -1457,6 +1521,20 @@
+ AC_MSG_RESULT($ac_cv_pthread)
+ fi
+ 
++if test "x$ac_cv_kpthread" = xno && \
++   test "x$ac_cv_kthread" = xno && \
++   test "x$ac_cv_pthread" = xno && \
++   test "x$ac_cv_pthread_is_default" = xno
++then
++	AC_MSG_CHECKING(for NT threads)
++	AC_CACHE_VAL(ac_cv_ntthread,
++	[AC_LINK_IFELSE([
++		AC_LANG_PROGRAM([], [_beginthread(0, 0, 0);])],
++	ac_cv_ntthread=yes,
++	ac_cv_ntthread=no)])
++	AC_MSG_RESULT([$ac_cv_ntthread])
++fi
++
+ # If we have set a CC compiler flag for thread support then
+ # check if it works for CXX, too.
+ ac_cv_cxx_thread=no
+@@ -1477,6 +1555,9 @@
+ then 
+   CXX="$CXX -pthread"
+   ac_cv_cxx_thread=yes
++elif test "x$ac_cv_ntthread" = xyes
++then
++  ac_cv_cxx_thread=always
+ fi
+ 
+ if test $ac_cv_cxx_thread = yes
+@@ -1518,7 +1599,7 @@
+ sys/termio.h sys/time.h \
+ sys/times.h sys/types.h sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
+ sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \
+-bluetooth/bluetooth.h linux/tipc.h spawn.h util.h alloca.h)
++bluetooth/bluetooth.h linux/tipc.h spawn.h util.h alloca.h winsock2.h)
+ AC_HEADER_DIRENT
+ AC_HEADER_MAJOR
+ 
+@@ -1747,19 +1828,20 @@
+ elif test "$ac_cv_pthread" = "yes"
+ then CC="$CC -pthread"
+ fi
+-AC_MSG_CHECKING(for pthread_t)
+-have_pthread_t=no
+-AC_COMPILE_IFELSE([
+-  AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_t x; x = *(pthread_t*)0;]])
+-],[have_pthread_t=yes],[])
+-AC_MSG_RESULT($have_pthread_t)
+-if test "$have_pthread_t" = yes ; then
++dnl NOTE: avoid duplicate check for pthread_t(it is done in AC_CHECK_SIZEOF(pthread_t...) )
++dnl AC_MSG_CHECKING(for pthread_t)
++dnl have_pthread_t=no
++dnl AC_COMPILE_IFELSE([
++dnl   AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_t x; x = *(pthread_t*)0;]])
++dnl ],[have_pthread_t=yes],[])
++dnl AC_MSG_RESULT($have_pthread_t)
++dnl if test "$have_pthread_t" = yes ; then
+   AC_CHECK_SIZEOF(pthread_t, [], [
+ #ifdef HAVE_PTHREAD_H
+ #include <pthread.h>
+ #endif
+   ])
+-fi
++dnl fi
+ CC="$ac_save_cc"
+ 
+ AC_MSG_CHECKING(for --enable-toolbox-glue)
+@@ -1920,6 +2002,16 @@
+ 	CYGWIN*)   SO=.dll;;
+ 	*)	   SO=.so;;
+ 	esac
++	case $host in
++	*-*-mingw*)
++	#NOTE: see _PyImport_DynLoadFiletab in dynload_win.c
++	if test "x$Py_DEBUG" = xtrue; then
++		SO=_d.pyd
++	else
++		SO=.pyd
++	fi
++	;;
++	esac
+ else
+ 	# this might also be a termcap variable, see #610332
+         echo
+@@ -2076,6 +2168,12 @@
+ 		LDCXXSHARED="g++ -shared";;
+ 	*)	LDSHARED="ld";;
+ 	esac
++	case $host in
++	*-*-mingw*)
++		LDSHARED='$(CC) -shared -Wl,--enable-auto-image-base'
++		LDCXXSHARED='$(CXX) -shared -Wl,--enable-auto-image-base'
++		;;
++	esac
+ fi
+ AC_MSG_RESULT($LDSHARED)
+ LDCXXSHARED=${LDCXXSHARED-$LDSHARED}
+@@ -2173,6 +2271,12 @@
+ 		# when running test_compile.py.
+ 		LINKFORSHARED='-Wl,-E -N 2048K';;
+ 	esac
++	case $host in
++	*-*-mingw*)
++		if test x$enable_shared = xyes; then
++			LINKFORSHARED='-Wl,--out-implib=$(LDLIBRARY)'
++		fi;;
++	esac
+ fi
+ AC_MSG_RESULT($LINKFORSHARED)
+ 
+@@ -2189,6 +2293,12 @@
+ 	*)
+ 		CFLAGSFORSHARED='$(CCSHARED)'
+ 	esac
++	case $host in
++	*-*-mingw*)
++		# TODO mingw may needs CCSHARED when building extension DLLs
++		# but not when building the interpreter DLL.
++		CFLAGSFORSHARED='';;
++	esac
+ fi
+ AC_MSG_RESULT($CFLAGSFORSHARED)
+ 
+@@ -2221,9 +2331,18 @@
+ fi
+ 
+ # check if we need libintl for locale functions
++case $host in
++  *-*-mingw*)
++  dnl Native windows build don't use libintl (see _localemodule.c).
++  dnl Also we don't like setup.py to add "intl" library to the list
++  dnl when build _locale module.
++  ;;
++  *)
+ AC_CHECK_LIB(intl, textdomain,
+ 	AC_DEFINE(WITH_LIBINTL, 1,
+ 	[Define to 1 if libintl is needed for locale functions.]))
++  ;;
++esac
+ 
+ # checks for system dependent C++ extensions support
+ case "$ac_sys_system" in
+@@ -2405,6 +2524,13 @@
+     AC_DEFINE(WITH_THREAD)
+     posix_threads=yes
+     THREADOBJ="Python/thread.o"
++elif test "x$ac_cv_ntthread" = xyes
++then
++    AC_DEFINE(WITH_THREAD)
++    posix_threads=no
++    THREADOBJ="Python/thread.o"
++    AC_DEFINE(NT_THREADS, 1,
++	[Define to 1 if you want to use native NT threads])
+ else
+     if test ! -z "$with_threads" -a -d "$with_threads"
+     then LDFLAGS="$LDFLAGS -L$with_threads"
+@@ -2572,6 +2698,18 @@
+ fi
+ 
+ 
++AC_SUBST(BUILDIN_WIN32_MODULE)
++BUILDIN_WIN32_MODULE='#'
++case $host in
++  *-*-mingw*)
++    # On win32 host(mingw build MSYS environment) site.py fail to load
++    # if _functools is not build-in by reason of dependency:
++    #   setup->site->locale->functools&operator
++    BUILDIN_WIN32_MODULE=
++  ;;
++esac
++
++
+ # Check for enable-ipv6
+ AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
+ AC_MSG_CHECKING([if --enable-ipv6 is specified])
+@@ -2851,6 +2989,14 @@
+ 	fi
+ 	;;
+ 	esac
++	case $host in
++	*-*-mingw*)
++	# FIXME: it is good to use portable "$OBJEXT" instead "o" but
++	# python build isn't yet ready to use it (see Makefile.pre.in)
++	#DYNLOADFILE="dynload_win.$OBJEXT"
++	DYNLOADFILE="dynload_win.o"
++	;;
++	esac
+ fi
+ AC_MSG_RESULT($DYNLOADFILE)
+ if test "$DYNLOADFILE" != "dynload_stub.o"
+@@ -2863,6 +3009,11 @@
+ 
+ AC_SUBST(MACHDEP_OBJS)
+ AC_MSG_CHECKING(MACHDEP_OBJS)
++case $host in
++  *-*-mingw*)
++    extra_machdep_objs="PC/dl_nt.o PC/getpathp.o PC/import_nt.o"
++    ;;
++esac
+ if test -z "$MACHDEP_OBJS"
+ then
+ 	MACHDEP_OBJS=$extra_machdep_objs
+@@ -2888,6 +3039,17 @@
+  sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \
+  truncate uname unsetenv utimes waitpid wait3 wait4 wcscoll _getpty)
+ 
++dnl NOTE: On windows platform some functions aren't C functions and require
++dnl additional non-standard decoration and may be libraries.
++dnl As example winsock2 functions, although are based on berkeley sockets
++dnl use stdcall convention. Also they require an additional library ws2_32.
++dnl One of those functions is "getpeername" (see list above)
++dnl and can't be detected by script. Now this impact mingw host platforms.
++dnl Since this function is used only by socketmodule, module include
++dnl necessary headers and is linked with requred libs (see setup.py)
++dnl windows exception will be handled in module code.
++dnl FIXME: If you don't like this, write appropriate check here.
++
+ # For some functions, having a definition is not sufficient, since
+ # we want to take their address.
+ AC_MSG_CHECKING(for chroot)
+@@ -3294,6 +3456,15 @@
+   ac_cv_buggy_getaddrinfo=yes
+ fi]))
+ fi
++case $host in
++  *-*-mingw*)
++  #FIXME: mingw "w32api" define getaddinfo if WINVER >= 0x501, i.e. XP or greater.
++  #TODO: mingw require additional check.
++  #NOTE: above check is not correct for windows platforms.
++  #  ac_cv_buggy_getaddrinfo=no
++    :
++    ;;
++esac
+ 
+ AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
+ 
+@@ -3349,19 +3520,33 @@
+ 
+ AC_MSG_CHECKING(for addrinfo)
+ AC_CACHE_VAL(ac_cv_struct_addrinfo,
+-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]], [[struct addrinfo a]])],
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++#ifdef HAVE_WINSOCK2_H
++#  include <ws2tcpip.h>
++#else
++#  include <netdb.h>
++#endif]],
++    [[struct addrinfo a]])],
+   [ac_cv_struct_addrinfo=yes],
+   [ac_cv_struct_addrinfo=no]))
+ AC_MSG_RESULT($ac_cv_struct_addrinfo)
+ if test $ac_cv_struct_addrinfo = yes; then
+-	AC_DEFINE(HAVE_ADDRINFO, 1, [struct addrinfo (netdb.h)])
++	AC_DEFINE(HAVE_ADDRINFO, 1, [struct addrinfo])
+ fi
+ 
+ AC_MSG_CHECKING(for sockaddr_storage)
+ AC_CACHE_VAL(ac_cv_struct_sockaddr_storage,
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+-#		include <sys/types.h>
+-#		include <sys/socket.h>]], [[struct sockaddr_storage s]])],
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
++#ifdef HAVE_WINSOCK2_H
++#include <winsock2.h>
++#endif]],
++    [[struct sockaddr_storage s]])],
+   [ac_cv_struct_sockaddr_storage=yes],
+   [ac_cv_struct_sockaddr_storage=no]))
+ AC_MSG_RESULT($ac_cv_struct_sockaddr_storage)
+@@ -3555,11 +3740,16 @@
+ 
+ # check for --with-libm=...
+ AC_SUBST(LIBM)
++dnl obsolete style to set libraries for a system
+ case $ac_sys_system in
+ Darwin) ;;
+ BeOS) ;;
+ *) LIBM=-lm
+ esac
++dnl new style to set libraries for host system
++case $host in
++  *-*-mingw*) LIBM=;;
++esac
+ AC_MSG_CHECKING(for --with-libm=STRING)
+ AC_ARG_WITH(libm,
+             AS_HELP_STRING([--with-libm=STRING], [math library]),
+@@ -3593,6 +3783,13 @@
+ # **************************************************
+ # * Check for various properties of floating point *
+ # **************************************************
++case $host in
++  *-*-mingw*)
++    ac_cv_little_endian_double=yes
++    ac_cv_big_endian_double=no
++    ac_cv_mixed_endian_double=no
++  ;;
++esac
+ 
+ AC_MSG_CHECKING(whether C doubles are little-endian IEEE 754 binary64)
+ AC_CACHE_VAL(ac_cv_little_endian_double, [
+@@ -3676,6 +3873,8 @@
+ 
+ # This inline assembler syntax may also work for suncc and icc,
+ # so we try it on all platforms.
++# Note MSVC build use Python/dtoa.c, but I could not find any reason
++# to use this file for GCC(mingw*) builds, so mingw* will use gcc asm :)
+ 
+ AC_MSG_CHECKING(whether we can use gcc inline assembler to get and set x87 control word)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
+@@ -3723,6 +3922,11 @@
+ [ac_cv_x87_double_rounding=yes],
+ [ac_cv_x87_double_rounding=no])
+ CC="$ac_save_cc"
++if test "x$cross_compiling" = xyes; then
++  case $host in
++    *-*-mingw*) ac_cv_x87_double_rounding=yes;;
++  esac
++fi
+ AC_MSG_RESULT($ac_cv_x87_double_rounding)
+ if test "$ac_cv_x87_double_rounding" = yes
+ then
+@@ -3740,6 +3944,12 @@
+ # On FreeBSD 6.2, it appears that tanh(-0.) returns 0. instead of
+ # -0. on some architectures.
+ AC_MSG_CHECKING(whether tanh preserves the sign of zero)
++case $host in
++  *-*-mingw*)
++    # Some MSVC runtimes don't preserve zero sign.
++    # On mingw host we will use always replacement function.
++    ac_cv_tanh_preserves_zero_sign=no;;
++esac
+ AC_CACHE_VAL(ac_cv_tanh_preserves_zero_sign, [
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <math.h>
+@@ -3765,6 +3975,12 @@
+ 
+ AC_CHECK_FUNCS([acosh asinh atanh copysign erf erfc expm1 finite gamma])
+ AC_CHECK_FUNCS([hypot lgamma log1p round tgamma])
++dnl NOTE:
++dnl MSVC build PC/pyconfig.h define HAVE_DECL_ISINF but it is useless
++dnl since header define Py_IS_INFINITY as (!_finite(X) && !_isnan(X)).
++dnl Also in pymath.h is commented too how PC/pyconfig.h define isinf.
++dnl For mingw to keep compatibility with MSVC build we will define
++dnl Py_IS_INFINITY in pyport.h.
+ AC_CHECK_DECLS([isinf, isnan, isfinite], [], [], [[#include <math.h>]])
+ 
+ LIBS=$LIBS_SAVE
+@@ -3774,6 +3990,13 @@
+ # the kernel module that provides POSIX semaphores
+ # isn't loaded by default, so an attempt to call
+ # sem_open results in a 'Signal 12' error.
++if test $ac_cv_func_sem_open = yes; then
++case $host in
++  *-*-mingw*)
++    # GCC 4.4+ (mingw) support posix threads(!)
++    # bug we won't use them on windows platform.
++    ac_cv_posix_semaphores_enabled=no;;
++esac
+ AC_MSG_CHECKING(whether POSIX semaphores are enabled)
+ AC_CACHE_VAL(ac_cv_posix_semaphores_enabled,
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+@@ -3799,6 +4022,9 @@
+ [ac_cv_posix_semaphores_enabled=yes])
+ )
+ AC_MSG_RESULT($ac_cv_posix_semaphores_enabled)
++else
++   ac_cv_posix_semaphores_enabled=no
++fi
+ if test $ac_cv_posix_semaphores_enabled = no
+ then
+   AC_DEFINE(POSIX_SEMAPHORES_NOT_ENABLED, 1,
+@@ -3807,6 +4033,16 @@
+ 
+ # Multiprocessing check for broken sem_getvalue
+ AC_MSG_CHECKING(for broken sem_getvalue)
++case $host in
++  *-*-mingw*)
++    # GCC(mingw) 4.4+ require and use posix threads(pthreads-w32)
++    # Also system may contain installed pthreads-w32.
++    # NOTE the test case below don't work for pthreads-w32:
++    # - SEM_FAILED is not defined;
++    # - sem_open is stub;
++    # - sem_getvalue work(!).
++    ac_cv_broken_sem_getvalue=no;;
++esac
+ AC_CACHE_VAL(ac_cv_broken_sem_getvalue,
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <unistd.h>
+@@ -3892,6 +4128,9 @@
+ then
+   # check whether wchar_t is signed or not
+   AC_MSG_CHECKING(whether wchar_t is signed)
++  case $host in
++    *-*-mingw*) ac_cv_wchar_t_signed=no;;
++  esac
+   AC_CACHE_VAL(ac_cv_wchar_t_signed, [
+   AC_RUN_IFELSE([AC_LANG_SOURCE([[
+   #include <wchar.h>
+@@ -4323,6 +4562,12 @@
+ )
+ 
+ AC_MSG_NOTICE([checking for device files])
++case $host in
++  *-*-mingw*)
++    ac_cv_file__dev_ptmx=ignore #NOTE: under MSYS environment device exist
++    ac_cv_file__dev_ptc=no
++    ;;
++esac
+ 
+ dnl NOTE: Inform user how to proceed with files when cross compiling.
+ if test "x$cross_compiling" = xyes; then
+@@ -4351,6 +4596,9 @@
+ 
+ if test "$have_long_long" = yes
+ then
++  case $host in
++    *-*-mingw*) ac_cv_have_long_long_format=yes;;
++  esac
+   AC_MSG_CHECKING(for %lld and %llu printf() format support)
+   AC_CACHE_VAL(ac_cv_have_long_long_format,
+   AC_RUN_IFELSE([AC_LANG_SOURCE([[[
+@@ -4419,6 +4667,9 @@
+ fi
+ 
+ 
++case $host in
++  *-*-mingw*) ac_cv_have_size_t_format=no;;
++esac
+ AC_CACHE_CHECK([for %zd printf() format support], ac_cv_have_size_t_format, [dnl
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <stdio.h>
+@@ -4465,6 +4716,8 @@
+   [Define to printf format modifier for Py_ssize_t])
+ fi
+ 
++dnl NOTE: check is incorrect for win host systems, i.e. mingw and etc.,
++dnl but on those systems socklen_t is defined in ws2tcpip.h as int ;)
+ AC_CHECK_TYPE(socklen_t,,
+   AC_DEFINE(socklen_t,int,
+             [Define to `int' if <sys/socket.h> does not define.]),[
+@@ -4489,8 +4742,39 @@
+   THREADHEADERS="$THREADHEADERS \$(srcdir)/$h"
+ done
+ 
++# FIXME: in cross-compilation env. (mingw on linux) how to select correct compiler ?
++# The current py-code will created modules with .so suffix and environment
++# variable setting SO=$(SO) don't help
++# see output of: python setup.py build --help-compiler
++AC_SUBST(PYMOD_BUILDOPT)
++case $host in
++  *-*-mingw*) PYMOD_BUILDOPT="--compiler mingw32";;
++esac
++
++dnl Objects for python and modules
++# Python interpreter main program for frozen scripts
++AC_SUBST(PYTHON_OBJS_FROZENMAIN)
++PYTHON_OBJS_FROZENMAIN="Python/frozenmain.o"
++# MODULE_GETPATH - default sys.path calculations
++AC_SUBST(MODULE_GETPATH)
++MODULE_GETPATH=Modules/getpath.o
++case $host in
++  *-*-mingw*)
++    dnl "PC" is project sub-directory and we has to prepend user defined flags
++    CPPFLAGS="-I\$(srcdir)/Python -I\$(srcdir)/PC $CPPFLAGS"
++
++    # FIXME: why windows builds don't use PC/frozen_dllmain.o ?
++    PYTHON_OBJS_FROZENMAIN=""
++    # default sys.path calculations for windows platforms
++    MODULE_GETPATH=PC/getpathp.o
++    ;;
++esac
++
+ AC_SUBST(SRCDIRS)
+ SRCDIRS="Parser Grammar Objects Python Modules Mac"
++case $host in
++  *-*-mingw*) SRCDIRS="$SRCDIRS PC";;
++esac
+ AC_MSG_CHECKING(for build directories)
+ for dir in $SRCDIRS; do
+     if test ! -d $dir; then
+diff -urN a/Include/objimpl.h b/Include/objimpl.h
+--- a/Include/objimpl.h	2013-05-12 04:32:41.000000000 +0100
++++ b/Include/objimpl.h	2013-05-17 23:57:26.929332576 +0100
+@@ -256,6 +256,12 @@
+         Py_ssize_t gc_refs;
+     } gc;
+     long double dummy;  /* force worst-case alignment */
++#if defined(__MINGW32__)
++/* FIXME: what about 64-bit platforms ?
++ * see http://mail.python.org/pipermail/python-dev/2009-July/090724.html
++ */
++	double dummy1;
++#endif
+ } PyGC_Head;
+ 
+ extern PyGC_Head *_PyGC_generation0;
+diff -urN a/Include/pymath.h b/Include/pymath.h
+--- a/Include/pymath.h	2013-05-12 04:32:41.000000000 +0100
++++ b/Include/pymath.h	2013-05-17 23:57:26.930332588 +0100
+@@ -109,6 +109,8 @@
+  *    non-infinite value v sitting in an 80-bit x87 register such that
+  *    v becomes infinite when spilled from the register to 64-bit memory.
+  * Note: PC/pyconfig.h defines Py_IS_INFINITY as _isinf
++ * FIXME: PC/pyconfig.h defines Py_IS_INFINITY as (!_finite(X) && !_isnan(X))
++ * so that above note isn't correct !!!
+  */
+ #ifndef Py_IS_INFINITY
+ #  if defined HAVE_DECL_ISINF && HAVE_DECL_ISINF == 1
+diff -urN a/Include/pyport.h b/Include/pyport.h
+--- a/Include/pyport.h	2013-05-12 04:32:41.000000000 +0100
++++ b/Include/pyport.h	2013-05-17 23:57:26.930332588 +0100
+@@ -693,6 +693,137 @@
+ #endif /* 0 */
+ 
+ 
++#ifdef __MINGW32__
++/* FIXME: some of next definitions specific to gcc(mingw build) can be
++   generalized on definitions of _WIN32 or WIN32 and to be common for
++   all windows build instead explicitly to define only for non-autotools
++   based builds (see PC/pyconfig.h for details). */
++#if !defined(MS_WIN64) && defined(_WIN64)
++#  define MS_WIN64
++#endif
++#if !defined(MS_WIN32) && defined(_WIN32)
++#  define MS_WIN32
++#endif
++#if !defined(MS_WIN32) && defined(_WIN32)
++#  define MS_WIN32
++#endif
++#if !defined(MS_WINDOWS) && defined(MS_WIN32)
++#  define MS_WINDOWS
++#endif
++
++#ifndef PYTHONPATH
++#  define PYTHONPATH ".\\DLLs;.\\lib;.\\lib\\plat-win;.\\lib\\lib-tk"
++#endif
++
++/* python 2.6+ requires Windows 2000 or greater. */
++#define Py_WINVER 0x0500
++
++#if defined(Py_BUILD_CORE) || defined(Py_BUILD_CORE_MODULE)
++/* FIXME if NTDDI_xxx is in use by mingw (see PC/pyconfig.h) */
++#ifndef WINVER
++#  define WINVER Py_WINVER
++#endif
++#ifndef _WIN32_WINNT
++#  define _WIN32_WINNT Py_WINVER
++#endif
++#endif
++
++#ifdef PLATFORM
++/*NOTE: if compile getplatform.c PLATFORM is set to MACHDEP that is
++  "win" for mingw build (see respective comment in configure.in). */
++# undef PLATFORM
++#endif
++/* always set to "win32" - see PC/pyconfig.h */
++#define PLATFORM "win32"
++
++#if defined(MS_WIN64)
++#  define SIZEOF_HKEY 8
++#elif defined(MS_WIN32)
++#  define SIZEOF_HKEY 4
++#endif
++
++/*NOTE: mingw has isinf as macro defined in math.h.
++  Since PC/pyconfig.h define Py_IS_INFINITY(X) that cover HAVE_DECL_ISFINITE
++  here for Py_IS_INFINITY we define same as for MSVC build.
++  This makes HAVE_DECL_ISFINITE needless.
++  Also see commants in configure.in and pymath.h. */
++#define Py_IS_INFINITY(X) (!_finite(X) && !_isnan(X))
++
++#ifndef HAVE_LARGEFILE_SUPPORT
++/*
++  FIXME: on windows platforms:
++   - Python use PY_LONG_LONG(!) for Py_off_t (_fileio.c);
++   - HAVE_LARGEFILE_SUPPORT is defined in PC/pyconfig.h;
++   - PC/pyconfig.h define 4 for SIZEOF_OFF_T and 8 for SIZEOF_FPOS_T;
++   - If HAVE_LARGEFILE_SUPPORT isn't defined python will use off_t(!)
++   for Py_off_t (see fileobjects.c and bz2module.c).
++  Since for mingw configure detect 4 for size of "off_t" and 8 - for
++  "fpos_t" we has to define HAVE_LARGEFILE_SUPPORT too.
++  TODO: to test with AC_SYS_LARGEFILE and appropriate updates in
++  python code.
++*/
++#  define HAVE_LARGEFILE_SUPPORT
++#endif
++
++#if defined(Py_ENABLE_SHARED)
++#  define MS_COREDLL 1 /* deprecated old symbol, but still in use for windows code */
++#else
++#  define MS_NO_COREDLL 1
++#endif
++
++#if Py_UNICODE_SIZE == 2
++/* For mingw is 2 but FIXME: What about to raise error in configure if
++   unicode size isn't two ? Did python windows code support ucs4 ? */
++#  define Py_WIN_WIDE_FILENAMES
++#endif
++
++/* NOTE: Don't define HAVE_STDDEF_H.
++ * It is defined by PC/pyconfig.h and used by Include/Python.h
++ * (with comment For size_t?) but isn't required for mingw  */
++#define Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE
++
++/* All other defines from PC/pyconfig.h are in autoconf generated
++   pyconfig.h */
++#if 0
++/*FIXME:
++  MSDN:
++    "The getaddrinfo function was added to the ws2_32.dll on Windows XP
++    and later."
++  mingw:
++    getaddrinfo and getnameinfo is defined for WINVER >= 0x0501.
++  PC/pyconfig.h:
++    "Python 2.6+ requires Windows 2000 or greater"
++  So far so good but socketmodule.h define HAVE_GETADDRINFO and
++  HAVE_GETNAMEINFO under very specific condition :
++    # ifdef SIO_GET_MULTICAST_FILTER
++    #  include <MSTcpIP.h>
++  So the question is "Separate SDKs" required for w2k in MSVC build ?
++  TODO: resolve later, may by configure :-/. For now python code will
++  use fake implementation and if user define appropriate value for
++  WINVER - the functionas from C runtime.
++  For details see socketmodule.c .
++  */
++#ifndef HAVE_GETADDRINFO
++#  define HAVE_GETADDRINFO
++#endif
++#ifndef HAVE_GETNAMEINFO
++#  define HAVE_GETNAMEINFO
++#endif
++#endif
++
++/* Refer to <Modules/_math.h> .
++   For mingw host configure detect functions described as HAVE_XXX
++   in _math.h but as MSVC don't define them we will undefine HAVE_XXX
++   too to use _Py_* replacements same as MSVC build .
++ */
++#undef HAVE_ACOSH
++#undef HAVE_ASINH
++#undef HAVE_ATANH
++#undef HAVE_EXPM1
++#undef HAVE_LOG1P
++
++#endif /*def __MINGW32__*/
++
+ /* On 4.4BSD-descendants, ctype functions serves the whole range of
+  * wchar_t character set rather than single byte code points only.
+  * This characteristic can break some operations of string object
+@@ -746,12 +877,12 @@
+ */
+ 
+ /*
+-  All windows ports, except cygwin, are handled in PC/pyconfig.h.
++  MSVC windows port is handled in PC/pyconfig.h.
+ 
+-  BeOS and cygwin are the only other autoconf platform requiring special
+-  linkage handling and both of these use __declspec().
++  BeOS, mingw32 and cygwin use autoconf and require special
++  linkage handling and all of these use __declspec().
+ */
+-#if defined(__CYGWIN__) || defined(__BEOS__)
++#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BEOS__)
+ #       define HAVE_DECLSPEC_DLL
+ #endif
+ 
+@@ -774,9 +905,17 @@
+         /* Under Cygwin, auto-import functions to prevent compilation */
+         /* failures similar to those described at the bottom of 4.1: */
+         /* http://docs.python.org/extending/windows.html#a-cookbook-approach */
+-#                       if !defined(__CYGWIN__)
++#                       if !defined(__CYGWIN__) && !defined(__MINGW32__)
+ #                               define PyAPI_FUNC(RTYPE) __declspec(dllimport) RTYPE
+-#                       endif /* !__CYGWIN__ */
++#                       else
++#                               define PyAPI_FUNC(RTYPE) RTYPE
++#                       endif /* !__CYGWIN__  !__MINGW32__ */
++            /* NOTE: The issue3945 "compile error in _fileio.c (cygwin)"
++             * was resolved with modification of code.
++             * This issue was resolved for gcc(mingw) with enabling auto
++             * import feature. Since _fileio.c problem now disappear there
++             * is no more reasons to avoid dllimport for gcc(mingw).
++             */
+ #                       define PyAPI_DATA(RTYPE) extern __declspec(dllimport) RTYPE
+         /* module init functions outside the core must be exported */
+ #                       if defined(__cplusplus)
+diff -urN a/Lib/ctypes/test/test_as_parameter.py b/Lib/ctypes/test/test_as_parameter.py
+--- a/Lib/ctypes/test/test_as_parameter.py	2013-05-12 04:32:42.000000000 +0100
++++ b/Lib/ctypes/test/test_as_parameter.py	2013-05-17 23:57:26.930332588 +0100
+@@ -1,6 +1,7 @@
+ import unittest
+ from ctypes import *
+ import _ctypes_test
++import sys
+ 
+ dll = CDLL(_ctypes_test.__file__)
+ 
+@@ -171,6 +172,10 @@
+         s2h = dll.ret_2h_func(self.wrap(inp))
+         self.assertEqual((s2h.x, s2h.y), (99*2, 88*3))
+ 
++    # This is known cdecl incompatibility between GCC
++    # and MSVC. It is addressed in GCC issue #36834.
++    # Python libffi detect it and complain.
++    @unittest.skipIf(sys.platform == "win32" and sys.version.find("GCC") >= 0, 'XFAIL GCC(mingw)')
+     def test_struct_return_8H(self):
+         class S8I(Structure):
+             _fields_ = [("a", c_int),
+diff -urN a/Lib/ctypes/test/test_functions.py b/Lib/ctypes/test/test_functions.py
+--- a/Lib/ctypes/test/test_functions.py	2013-05-12 04:32:42.000000000 +0100
++++ b/Lib/ctypes/test/test_functions.py	2013-05-17 23:57:26.931332600 +0100
+@@ -359,6 +359,10 @@
+             s2h = windll.s_ret_2h_func(S2H(99, 88))
+             self.assertEqual((s2h.x, s2h.y), (99*2, 88*3))
+ 
++    # This is known cdecl incompatibility between GCC
++    # and MSVC. It is addressed in GCC issue #36834.
++    # Python libffi detect it and complain.
++    @unittest.skipIf(sys.platform == "win32" and sys.version.find("GCC") >= 0, 'XFAIL GCC(mingw)')
+     def test_struct_return_8H(self):
+         class S8I(Structure):
+             _fields_ = [("a", c_int),
+diff -urN a/Lib/ctypes/util.py b/Lib/ctypes/util.py
+--- a/Lib/ctypes/util.py	2013-05-12 04:32:42.000000000 +0100
++++ b/Lib/ctypes/util.py	2013-05-17 23:57:26.931332600 +0100
+@@ -7,6 +7,11 @@
+ if os.name == "nt":
+ 
+     def _get_build_version():
++        #***********************************************************
++        # NOTE: As example for GCC(mingw) build sys.version return:
++        # '2.7a0 (trunk:<REVISION>M, <DATE>, <TIME>) \n[GCC 3.4.5 (mingw special)]'
++        # '2.7a0 (trunk:<REVISION>M, <DATE>, <TIME>) \n[GCC 4.4.0]'
++        #***********************************************************
+         """Return the version of MSVC that was used to build Python.
+ 
+         For Python 2.3 and up, the version number is included in
+@@ -30,6 +35,15 @@
+         return None
+ 
+     def find_msvcrt():
++        #************************************************************
++        # FIXME: For GCC(mingw) runtime don't depend from compiler
++        # version ;). We may use -D__MSVCRT_VERSION__ to detect which
++        # verion is requested by user, but the name of the library
++        # to be default.
++        # As example WXP is with version 7.0 of msvcrt.dll.
++        # Anyway since _get_build_version return 6 in most(standard)
++        # cases this method will return msvcrt{d}. May be not so bad.
++        #************************************************************
+         """Return the name of the VC runtime dll"""
+         version = _get_build_version()
+         if version is None:
+diff -urN a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py
+--- a/Lib/distutils/ccompiler.py	2013-05-12 04:32:42.000000000 +0100
++++ b/Lib/distutils/ccompiler.py	2013-05-17 23:57:26.931332600 +0100
+@@ -918,6 +918,8 @@
+         osname = os.name
+     if platform is None:
+         platform = sys.platform
++    if osname == "nt" and sys.version.find('GCC') >= 0:
++        return 'mingw32'
+     for pattern, compiler in _default_compilers:
+         if re.match(pattern, platform) is not None or \
+            re.match(pattern, osname) is not None:
+diff -urN a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
+--- a/Lib/distutils/command/build_ext.py	2013-05-12 04:32:42.000000000 +0100
++++ b/Lib/distutils/command/build_ext.py	2013-05-17 23:57:26.932332611 +0100
+@@ -19,7 +19,8 @@
+ from distutils.util import get_platform
+ from distutils import log
+ 
+-if os.name == 'nt':
++# GCC(mingw): os.name is "nt" but build system is posix
++if os.name == 'nt' and sys.version.find('GCC') < 0:
+     from distutils.msvccompiler import get_build_version
+     MSVC_VERSION = int(get_build_version())
+ 
+@@ -179,7 +180,8 @@
+         # for extensions under windows use different directories
+         # for Release and Debug builds.
+         # also Python's library directory must be appended to library_dirs
+-        if os.name == 'nt':
++        # GCC(mingw): os.name is "nt" but build system is posix
++        if os.name == 'nt' and sys.version.find('GCC') < 0:
+             # the 'libs' directory is for binary installs - we assume that
+             # must be the *native* platform.  But we don't really support
+             # cross-compiling via a binary install anyway, so we let it go.
+@@ -221,7 +223,8 @@
+ 
+         # for extensions under Cygwin and AtheOS Python's library directory must be
+         # appended to library_dirs
+-        if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos':
++        if (sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos'
++            or (sys.platform == 'win32' and sys.version.find('GCC') >= 0)):
+             if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")):
+                 # building third party extensions
+                 self.library_dirs.append(os.path.join(sys.prefix, "lib",
+@@ -699,6 +702,34 @@
+         # pyconfig.h that MSVC groks.  The other Windows compilers all seem
+         # to need it mentioned explicitly, though, so that's what we do.
+         # Append '_d' to the python import library on debug builds.
++
++        # FIXME: What is purpose of code below ?
++        # The posix build system khow requred libraries to build a module.
++        # The libraries are stored in config(Makefile) variables BLDLIBRARY,
++        # MODLIBS and SHLIBS. Note that some variables may contain linker
++        # flags.
++        # NOTE: For now we will check only GCC(mingw) compiler as is clear
++        # that we build for windows platfrom.
++        # The code for GCC(mingw) is not correct but this is distutils
++        # limitation - we has to pass variables to the linker as is
++        # instead only library names.
++        if self.compiler.compiler_type == 'mingw32':
++            from distutils import sysconfig
++            template = "python%s"
++            if self.debug:
++                template = template + '_d'
++            extra = [(template % (sysconfig.get_config_var('VERSION')))]
++            for lib in sysconfig.get_config_var('BLDLIBRARY').split():
++                if lib.startswith('-l'):
++                    extra.append(lib[2:])
++            for lib in sysconfig.get_config_var('MODLIBS').split():
++                if lib.startswith('-l'):
++                    extra.append(lib[2:])
++            for lib in sysconfig.get_config_var('SHLIBS').split():
++                if lib.startswith('-l'):
++                    extra.append(lib[2:])
++            return ext.libraries + extra
++
+         if sys.platform == "win32":
+             from distutils.msvccompiler import MSVCCompiler
+             if not isinstance(self.compiler, MSVCCompiler):
+diff -urN a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py
+--- a/Lib/distutils/cygwinccompiler.py	2013-05-12 04:32:42.000000000 +0100
++++ b/Lib/distutils/cygwinccompiler.py	2013-05-17 23:57:26.932332611 +0100
+@@ -60,6 +60,18 @@
+     """Include the appropriate MSVC runtime library if Python was built
+     with MSVC 7.0 or later.
+     """
++    # FIXME: next code is from issue870382
++    # MS C-runtime libraries never support backward compatibility.
++    # Linking to a different library without to specify correct runtime
++    # version for the headers will link renamed functions to msvcrt.
++    # See issue3308: this piece of code is python problem even
++    # with correct w32api headers.
++    # Issue: for MSVC compiler we can get the version and from version
++    # to determine mcvcrt as code below. But what about if python is
++    # build with GCC compiler?
++    # Output of sys.version is information for python build on first
++    # line, on the next line is information for the compiler and the
++    # output lack information for the C-runtime.
+     msc_pos = sys.version.find('MSC v.')
+     if msc_pos != -1:
+         msc_ver = sys.version[msc_pos+6:msc_pos+10]
+@@ -77,6 +89,8 @@
+             return ['msvcr90']
+         else:
+             raise ValueError("Unknown MS Compiler version %s " % msc_ver)
++    else:
++        return []
+ 
+ 
+ class CygwinCCompiler (UnixCCompiler):
+@@ -85,6 +99,9 @@
+     obj_extension = ".o"
+     static_lib_extension = ".a"
+     shared_lib_extension = ".dll"
++    # FIXME: dylib_... = ".dll.a" is not enought for binutils
++    # loader on win32 platform !!!
++    dylib_lib_extension = ".dll.a"
+     static_lib_format = "lib%s%s"
+     shared_lib_format = "%s%s"
+     exe_extension = ".exe"
+@@ -103,6 +120,10 @@
+                 "Compiling may fail because of undefined preprocessor macros."
+                 % details)
+ 
++        # Next line of code is problem for cross-compiled enviroment:
++        # NOTE: GCC cross-compiler is prefixed by the <hostarch>-<hostos>-
++        # and by default binaries are installed in same directory
++        # as native compiler.
+         self.gcc_version, self.ld_version, self.dllwrap_version = \
+             get_versions()
+         self.debug_print(self.compiler_type + ": gcc %s, ld %s, dllwrap %s\n" %
+@@ -127,6 +148,9 @@
+         else:
+             shared_option = "-mdll -static"
+ 
++        # FIXME:
++        # Hard-code may override unix-compiler settings and isn't
++        # possible to use Makefile variables to pass correct flags !
+         # Hard-code GCC because that's what this is all about.
+         # XXX optimization, warnings etc. should be customizable.
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+@@ -271,12 +295,20 @@
+         if output_dir is None: output_dir = ''
+         obj_names = []
+         for src_name in source_filenames:
+-            # use normcase to make sure '.rc' is really '.rc' and not '.RC'
+-            (base, ext) = os.path.splitext (os.path.normcase(src_name))
++            # FIXME: "bogus checks for suffix" - as example the commented
++            # by #BOGUS# code break valid assembler suffix ".S" !
++            #BOGUS## use normcase to make sure '.rc' is really '.rc' and not '.RC'
++            #BOGUS#base, ext = os.path.splitext(os.path.normcase(src_name))
++            base, ext = os.path.splitext (src_name)
++            ext_normcase = os.path.normcase(ext)
++            if ext_normcase in ['.rc','.res']:
++                ext = ext_normcase
+             if ext not in (self.src_extensions + ['.rc','.res']):
+                 raise UnknownFileError, \
+                       "unknown file type '%s' (from '%s')" % \
+                       (ext, src_name)
++            base = os.path.splitdrive(base)[1] # Chop off the drive
++            base = base[os.path.isabs(base):]  # If abs, chop off leading /
+             if strip_dir:
+                 base = os.path.basename (base)
+             if ext == '.res' or ext == '.rc':
+diff -urN a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
+--- a/Lib/distutils/sysconfig.py	2013-05-12 04:32:42.000000000 +0100
++++ b/Lib/distutils/sysconfig.py	2013-05-17 23:57:26.932332611 +0100
+@@ -77,19 +77,21 @@
+     if prefix is None:
+         prefix = plat_specific and EXEC_PREFIX or PREFIX
+ 
+-    if os.name == "posix":
++    # GCC(mingw): os.name is "nt" but build system is posix
++    if os.name == "posix" or sys.version.find('GCC') >= 0:
+         if python_build:
+-            buildir = os.path.dirname(sys.executable)
++            # NOTE: sysconfig.py-20091210
++            # Assume the executable is in the build directory.  The
++            # pyconfig.h file should be in the same directory.  Since
++            # the build directory may not be the source directory, we
++            # must use "srcdir" from the makefile to find the "Include"
++            # directory.
++            base = os.path.dirname(os.path.abspath(sys.executable))
+             if plat_specific:
+-                # python.h is located in the buildir
+-                inc_dir = buildir
++                return base
+             else:
+-                # the source dir is relative to the buildir
+-                srcdir = os.path.abspath(os.path.join(buildir,
+-                                         get_config_var('srcdir')))
+-                # Include is located in the srcdir
+-                inc_dir = os.path.join(srcdir, "Include")
+-            return inc_dir
++                incdir = os.path.join(get_config_var('srcdir'), 'Include')
++                return os.path.normpath(incdir)
+         return os.path.join(prefix, "include", "python" + get_python_version())
+     elif os.name == "nt":
+         return os.path.join(prefix, "include")
+@@ -153,8 +155,18 @@
+ 
+     Mainly needed on Unix, so we can plug in the information that
+     varies across Unices and is stored in Python's Makefile.
++
++    NOTE: (known limitation of python build/install system)
++    In cross-build environment make macros like CC and LDSHARED
++    contain cross-compiler/linker instead of host compiler/linker.
+     """
++    posix_build = None
+     if compiler.compiler_type == "unix":
++       posix_build = True
++    elif compiler.compiler_type == "mingw32":
++        if sys.version.find('GCC') >= 0:
++            posix_build = True
++    if posix_build == True:
+         if sys.platform == "darwin":
+             # Perform first-time customization of compiler-related
+             # config vars on OS X now that we know we need a compiler.
+@@ -218,7 +230,8 @@
+ def get_config_h_filename():
+     """Return full pathname of installed pyconfig.h file."""
+     if python_build:
+-        if os.name == "nt":
++        # GCC(mingw): os.name is "nt" but build system is posix
++        if os.name == "nt" and sys.version.find('GCC') < 0:
+             inc_dir = os.path.join(project_base, "PC")
+         else:
+             inc_dir = project_base
+@@ -396,6 +409,11 @@
+ 
+ def _init_nt():
+     """Initialize the module as appropriate for NT"""
++    if sys.version.find('GCC') >= 0:
++        # GCC(mingw) use posix build system
++        # FIXME: may be modification has to be in get_config_vars ?
++        _init_posix()
++        return
+     g = {}
+     # set basic install directories
+     g['LIBDEST'] = get_python_lib(plat_specific=0, standard_lib=1)
+diff -urN a/Lib/distutils/tests/test_bdist_msi.py b/Lib/distutils/tests/test_bdist_msi.py
+--- a/Lib/distutils/tests/test_bdist_msi.py	2013-05-12 04:32:42.000000000 +0100
++++ b/Lib/distutils/tests/test_bdist_msi.py	2013-05-17 23:57:26.933332623 +0100
+@@ -10,6 +10,7 @@
+                        support.LoggingSilencer,
+                        unittest.TestCase):
+ 
++    @unittest.skip("Require bdist_msi")
+     def test_minimal(self):
+         # minimal test XXX need more tests
+         from distutils.command.bdist_msi import bdist_msi
+diff -urN a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py
+--- a/Lib/distutils/tests/test_build_ext.py	2013-05-12 04:32:42.000000000 +0100
++++ b/Lib/distutils/tests/test_build_ext.py	2013-05-17 23:57:26.933332623 +0100
+@@ -60,6 +60,11 @@
+             sys.stdout = StringIO()
+         try:
+             cmd.ensure_finalized()
++            #Broken after issue 7712(r78136) : add a temp_cwd context manager to test_support ...
++            #Without current working dir: "...cannot find -lpython27"
++            #NOTE: [py3k svn r85559] First (uncontroversial) part of issue 9807, barry.warsaw, 2010-10-16 :
++            #  new _fixup_command is bogus, so we will use own work-around
++            cmd.library_dirs.insert(0, test_support.SAVEDCWD)
+             cmd.run()
+         finally:
+             sys.stdout = old_stdout
+@@ -281,6 +286,12 @@
+         # returns wrong result with --inplace
+         other_tmp_dir = os.path.realpath(self.mkdtemp())
+         old_wd = os.getcwd()
++        #Without current working dir: "...cannot find -lpython27"
++        #NOTE: After issue #7712(r78136) test cannot use old_wd !
++        #cmd.library_dirs.insert(0, old_wd)
++        #NOTE: [py3k svn r85559] First (uncontroversial) part of issue 9807, barry.warsaw, 2010-10-16 :
++        #  new _fixup_command is bogus, so we will use own work-around
++        cmd.library_dirs.insert(0, test_support.SAVEDCWD)
+         os.chdir(other_tmp_dir)
+         try:
+             cmd.inplace = 1
+diff -urN a/Lib/distutils/tests/test_config_cmd.py b/Lib/distutils/tests/test_config_cmd.py
+--- a/Lib/distutils/tests/test_config_cmd.py	2013-05-12 04:32:42.000000000 +0100
++++ b/Lib/distutils/tests/test_config_cmd.py	2013-05-17 23:57:26.933332623 +0100
+@@ -38,6 +38,7 @@
+         self.assertEqual(len(self._logs), numlines+1)
+ 
+     def test_search_cpp(self):
++        # TODO: mingw host ?
+         if sys.platform == 'win32':
+             return
+         pkg_dir, dist = self.create_dist()
+diff -urN a/Lib/distutils/tests/test_sysconfig.py b/Lib/distutils/tests/test_sysconfig.py
+--- a/Lib/distutils/tests/test_sysconfig.py	2013-05-12 04:32:42.000000000 +0100
++++ b/Lib/distutils/tests/test_sysconfig.py	2013-05-17 23:57:26.933332623 +0100
+@@ -43,9 +43,15 @@
+         # This is not much of a test.  We make sure Python.h exists
+         # in the directory returned by get_python_inc() but we don't know
+         # it is the correct file.
++        #Broken after issue 7712(r78136) : add a temp_cwd context manager to test_support ...
++        #NOTE: Its fail on platforms without root directory support(like windows)
++        #where temp and current working directories may stay on different drivers.
++        old_wd = os.getcwd()
++        os.chdir(SAVEDCWD)
+         self.assertTrue(os.path.isdir(inc_dir), inc_dir)
+         python_h = os.path.join(inc_dir, "Python.h")
+         self.assertTrue(os.path.isfile(python_h), python_h)
++        os.chdir(old_wd)
+ 
+     def test_parse_makefile_base(self):
+         self.makefile = test.test_support.TESTFN
+diff -urN a/Lib/distutils/tests/test_unixccompiler.py b/Lib/distutils/tests/test_unixccompiler.py
+--- a/Lib/distutils/tests/test_unixccompiler.py	2013-05-12 04:32:42.000000000 +0100
++++ b/Lib/distutils/tests/test_unixccompiler.py	2013-05-17 23:57:26.934332635 +0100
+@@ -120,7 +120,7 @@
+         def gcv(v):
+             return 'xxx'
+         sysconfig.get_config_var = gcv
+-        self.assertEqual(self.cc.rpath_foo(), '-R/foo')
++        self.assertEqual(self.cc.rpath_foo(), '-blibpath:/foo')
+ 
+ 
+ def test_suite():
+diff -urN a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
+--- a/Lib/distutils/unixccompiler.py	2013-05-12 04:32:42.000000000 +0100
++++ b/Lib/distutils/unixccompiler.py	2013-05-17 23:57:26.934332635 +0100
+@@ -234,6 +234,8 @@
+             return ["+s", "-L" + dir]
+         elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
+             return ["-rpath", dir]
++        elif sys.platform[:3] == "aix":
++            return "-blibpath:" + dir
+         elif self._is_gcc(compiler):
+             return "-Wl,-R" + dir
+         else:
+diff -urN a/Lib/sysconfig.py b/Lib/sysconfig.py
+--- a/Lib/sysconfig.py	2013-05-12 04:32:45.000000000 +0100
++++ b/Lib/sysconfig.py	2013-05-17 23:57:26.934332635 +0100
+@@ -130,8 +130,13 @@
+ 
+ if _PYTHON_BUILD:
+     for scheme in ('posix_prefix', 'posix_home'):
+-        _INSTALL_SCHEMES[scheme]['include'] = '{projectbase}/Include'
+-        _INSTALL_SCHEMES[scheme]['platinclude'] = '{srcdir}'
++        _INSTALL_SCHEMES[scheme]['include'] = '{srcdir}/Include'
++        _INSTALL_SCHEMES[scheme]['platinclude'] = '{projectbase}'
++
++    # GCC(mingw) use posix build system
++    if os.name == "nt" and sys.version.find('GCC') >= 0:
++        _INSTALL_SCHEMES['nt']['include'] = '{srcdir}/Include'
++        _INSTALL_SCHEMES['nt']['platinclude'] = '{projectbase}'
+ 
+ def _subst_vars(s, local_vars):
+     try:
+@@ -400,7 +405,8 @@
+ def get_config_h_filename():
+     """Returns the path of pyconfig.h."""
+     if _PYTHON_BUILD:
+-        if os.name == "nt":
++        # GCC(mingw): os.name is "nt" but build system is posix
++        if os.name == "nt" and sys.version.find('GCC') < 0:
+             inc_dir = os.path.join(_PROJECT_BASE, "PC")
+         else:
+             inc_dir = _PROJECT_BASE
+@@ -462,9 +468,19 @@
+         _CONFIG_VARS['platbase'] = _EXEC_PREFIX
+         _CONFIG_VARS['projectbase'] = _PROJECT_BASE
+ 
+-        if os.name in ('nt', 'os2'):
+-            _init_non_posix(_CONFIG_VARS)
++        # GCC(mingw) use posix build system
++        posix_build = None
+         if os.name == 'posix':
++            posix_build = True
++        else:
++            if os.name in ('nt', 'os2'):
++                if sys.version.find('GCC') >= 0:
++                    posix_build = True
++                else:
++                    posix_build = False
++        if posix_build == False:
++            _init_non_posix(_CONFIG_VARS)
++        if posix_build == True:
+             _init_posix(_CONFIG_VARS)
+ 
+         # Setting 'userbase' is done below the call to the
+@@ -479,7 +495,7 @@
+         # Normally it is relative to the build directory.  However, during
+         # testing, for example, we might be running a non-installed python
+         # from a different directory.
+-        if _PYTHON_BUILD and os.name == "posix":
++        if _PYTHON_BUILD and posix_build == True:
+             base = _PROJECT_BASE
+             try:
+                 cwd = os.getcwd()
+diff -urN a/Lib/test/regrtest.py b/Lib/test/regrtest.py
+--- a/Lib/test/regrtest.py	2013-05-12 04:32:45.000000000 +0100
++++ b/Lib/test/regrtest.py	2013-05-17 23:57:26.934332635 +0100
+@@ -389,7 +389,7 @@
+             found_garbage = []
+ 
+     if single:
+-        filename = os.path.join(TEMPDIR, 'pynexttest')
++        filename = os.path.join(tempfile.gettempdir(), 'pynexttest')
+         try:
+             fp = open(filename, 'r')
+             next_test = fp.read().strip()
+@@ -1542,8 +1542,7 @@
+     # to keep the test files in a subfolder.  It eases the cleanup of leftover
+     # files using command "make distclean".
+     if sysconfig.is_python_build():
+-        TEMPDIR = os.path.join(sysconfig.get_config_var('srcdir'), 'build')
+-        TEMPDIR = os.path.abspath(TEMPDIR)
++        TEMPDIR = os.path.abspath('build')
+         if not os.path.exists(TEMPDIR):
+             os.mkdir(TEMPDIR)
+ 
+diff -urN a/Lib/test/test_curses.py b/Lib/test/test_curses.py
+--- a/Lib/test/test_curses.py	2013-05-12 04:32:46.000000000 +0100
++++ b/Lib/test/test_curses.py	2013-05-17 23:57:26.935332647 +0100
+@@ -167,11 +167,16 @@
+     curses.delay_output(1)
+     curses.echo() ; curses.echo(1)
+ 
+-    f = tempfile.TemporaryFile()
++    fx = tempfile.TemporaryFile()
++    # cf tempfile.py TemporaryFile vs NamedTemporaryFile
++    if os.name != 'posix' or os.sys.platform == 'cygwin':
++        f = fx.file
++    else:
++        f = fx
+     stdscr.putwin(f)
+     f.seek(0)
+     curses.getwin(f)
+-    f.close()
++    fx.close()
+ 
+     curses.halfdelay(1)
+     curses.intrflush(1)
+diff -urN a/Lib/test/test_os.py b/Lib/test/test_os.py
+--- a/Lib/test/test_os.py	2013-05-12 04:32:47.000000000 +0100
++++ b/Lib/test/test_os.py	2013-05-17 23:57:26.935332647 +0100
+@@ -325,7 +325,11 @@
+ 
+             def test_large_time(self):
+                 t1 = 5000000000 # some day in 2128
+-                os.utime(self.fname, (t1, t1))
++                try:
++                    #Note fail if time_t is 32 bit
++                    os.utime(self.fname, (t1, t1))
++                except OverflowError:
++                    self.skipTest("requires at least 64-bit time_t")
+                 self.assertEqual(os.stat(self.fname).st_mtime, t1)
+ 
+         def test_1686475(self):
+diff -urN a/Lib/test/test_sundry.py b/Lib/test/test_sundry.py
+--- a/Lib/test/test_sundry.py	2013-05-12 04:32:47.000000000 +0100
++++ b/Lib/test/test_sundry.py	2013-05-17 23:57:26.935332647 +0100
+@@ -27,7 +27,11 @@
+ 
+             import distutils.command.bdist_dumb
+             if sys.platform.startswith('win'):
+-                import distutils.command.bdist_msi
++                try:
++                    import distutils.command.bdist_msi # if msi module is not build
++                except ImportError:
++                    if test_support.verbose:
++                        print "skipping bdist_msi"
+             import distutils.command.bdist
+             import distutils.command.bdist_rpm
+             import distutils.command.bdist_wininst
+diff -urN a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in	2013-05-12 04:32:49.000000000 +0100
++++ b/Makefile.pre.in	2013-05-17 23:57:26.936332659 +0100
+@@ -207,7 +207,7 @@
+ # Modules
+ MODULE_OBJS=	\
+ 		Modules/config.o \
+-		Modules/getpath.o \
++		@MODULE_GETPATH@ \
+ 		Modules/main.o \
+ 		Modules/gcmodule.o
+ 
+@@ -304,7 +304,7 @@
+ 		Python/codecs.o \
+ 		Python/errors.o \
+ 		Python/frozen.o \
+-		Python/frozenmain.o \
++		@PYTHON_OBJS_FROZENMAIN@ \
+ 		Python/future.o \
+ 		Python/getargs.o \
+ 		Python/getcompiler.o \
+@@ -573,6 +573,7 @@
+ 	      -DHGBRANCH="\"`LC_ALL=C $(HGBRANCH)`\"" \
+ 	      -o $@ $(srcdir)/Modules/getbuildinfo.c
+ 
++# default sys.path calculations
+ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
+ 	$(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
+ 		-DPREFIX='"$(prefix)"' \
+@@ -581,6 +582,10 @@
+ 		-DVPATH='"$(VPATH)"' \
+ 		-o $@ $(srcdir)/Modules/getpath.c
+ 
++# default sys.path calculations for windows platforms
++PC/getpathp.o: $(srcdir)/PC/getpathp.c
++	$(CC) -c $(PY_CFLAGS) -o $@ $(srcdir)/PC/getpathp.c
++
+ Modules/python.o: $(srcdir)/Modules/python.c
+ 	$(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
+ 
+diff -urN a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
+--- a/Modules/_ctypes/_ctypes.c	2013-05-12 04:32:49.000000000 +0100
++++ b/Modules/_ctypes/_ctypes.c	2013-05-17 23:57:26.936332659 +0100
+@@ -3166,11 +3166,27 @@
+     mangled_name = alloca(strlen(name) + 1 + 1 + 1 + 3); /* \0 _ @ %d */
+     if (!mangled_name)
+         return NULL;
++    /* FIXME: for stdcall decorated export functions MSVC compiler add
++     * underscore, but GCC compiler create them without.
++     * As well functions from system libraries are without underscore.
++     * This is visible by example for _ctypes_test.pyd module.
++     * Solutions:
++     * - If a python module is build with gcc option --add-stdcall-alias
++     * the module will contain XXX as alias for function XXX@ as result
++     * first search in this method will succeed.
++     * - Distutil may use compiler to create def-file, to modify it as
++     * add underscore alias and with new def file to create module.
++     * - Or may be just to search for function without underscore.
++     */
+     for (i = 0; i < 32; ++i) {
+         sprintf(mangled_name, "_%s@%d", name, i*4);
+         address = (PPROC)GetProcAddress(handle, mangled_name);
+         if (address)
+             return address;
++        sprintf(mangled_name, "%s@%d", name, i*4);
++        address = (PPROC)GetProcAddress(handle, mangled_name);
++        if (address)
++            return address;
+     }
+     return NULL;
+ #endif
+diff -urN a/Modules/_ctypes/libffi_msvc/win32.S b/Modules/_ctypes/libffi_msvc/win32.S
+--- a/Modules/_ctypes/libffi_msvc/win32.S	1970-01-01 01:00:00.000000000 +0100
++++ b/Modules/_ctypes/libffi_msvc/win32.S	2013-05-17 23:57:26.937332670 +0100
+@@ -0,0 +1,154 @@
++/* -----------------------------------------------------------------------
++   win32.S - Copyright (c) 1996, 1998, 2001, 2002  Red Hat, Inc.
++	     Copyright (c) 2001  John Beniton
++	     Copyright (c) 2002  Ranjit Mathew
++
++
++   X86 Foreign Function Interface
++
++   Permission is hereby granted, free of charge, to any person obtaining
++   a copy of this software and associated documentation files (the
++   ``Software''), to deal in the Software without restriction, including
++   without limitation the rights to use, copy, modify, merge, publish,
++   distribute, sublicense, and/or sell copies of the Software, and to
++   permit persons to whom the Software is furnished to do so, subject to
++   the following conditions:
++
++   The above copyright notice and this permission notice shall be included
++   in all copies or substantial portions of the Software.
++
++   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
++   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++   IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR
++   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
++   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++   OTHER DEALINGS IN THE SOFTWARE.
++   ----------------------------------------------------------------------- */
++
++#define LIBFFI_ASM
++#include <fficonfig.h>
++#include <ffi.h>
++
++.text
++
++.globl ffi_prep_args
++
++        # This assumes we are using gas.
++        .balign 16
++.globl _ffi_call_x86
++
++_ffi_call_x86:
++        pushl %ebp
++        movl  %esp,%ebp
++
++	#THe: save previous %esi, and store the current stack pointer in %esi
++	pushl %esi
++	movl %esp,%esi
++
++        # Make room for all of the new args.
++        movl  16(%ebp),%ecx
++        subl  %ecx,%esp
++
++        movl  %esp,%eax
++
++        # Place all of the ffi_prep_args in position
++        pushl 12(%ebp)
++        pushl %eax
++        call  *8(%ebp)
++
++        # Return stack to previous state and call the function
++        addl  $8,%esp
++
++        # FIXME: Align the stack to a 128-bit boundary to avoid
++        # potential performance hits.
++
++	call  *28(%ebp)
++
++	# Load ecif->cif->abi
++#masm#	mov ecx, [ebp + 12]
++        movl  12(%ebp),%ecx
++#masm#	mov ecx, [ecx]ecif.cif
++	movl  (%ecx),%ecx
++#masm#	mov ecx, [ecx]ecif.cif.abi
++	movl  (%ecx),%ecx
++#masm#	cmp ecx, FFI_STDCALL
++        cmpl  $2,%ecx
++        je   noclean
++
++	# STDCALL: Remove the space we pushed for the args
++        movl  16(%ebp),%ecx
++        addl  %ecx,%esp
++
++	# CDECL: Caller has already cleaned the stack
++noclean:
++	# Check that esp has the same value as before!
++	sub %esp,%esi # calculate stack pointer difference
++
++        # Load %ecx with the return type code
++        movl  20(%ebp),%ecx
++
++        # If the return value pointer is NULL, assume no return value.
++        cmpl  $0,24(%ebp)
++        jne   retint
++
++        # Even if there is no space for the return value, we are
++        # obliged to handle floating-point values.
++        cmpl  $FFI_TYPE_FLOAT,%ecx
++        jne   noretval
++        fstp  %st(0)
++
++        jmp   epilogue
++
++retint:
++        cmpl  $FFI_TYPE_INT,%ecx
++        jne   retfloat
++        # Load %ecx with the pointer to storage for the return value
++        movl  24(%ebp),%ecx
++        movl  %eax,0(%ecx)
++        jmp   epilogue
++
++retfloat:
++        cmpl  $FFI_TYPE_FLOAT,%ecx
++        jne   retdouble
++         # Load %ecx with the pointer to storage for the return value
++        movl  24(%ebp),%ecx
++        fstps (%ecx)
++        jmp   epilogue
++
++retdouble:
++        cmpl  $FFI_TYPE_DOUBLE,%ecx
++        jne   retlongdouble
++        # Load %ecx with the pointer to storage for the return value
++        movl  24(%ebp),%ecx
++        fstpl (%ecx)
++        jmp   epilogue
++
++retlongdouble:
++        cmpl  $FFI_TYPE_LONGDOUBLE,%ecx
++        jne   retint64
++        # Load %ecx with the pointer to storage for the return value
++        movl  24(%ebp),%ecx
++        fstpt (%ecx)
++        jmp   epilogue
++
++retint64:
++        cmpl  $FFI_TYPE_SINT64,%ecx
++        jne   retstruct
++        # Load %ecx with the pointer to storage for the return value
++        movl  24(%ebp),%ecx
++        movl  %eax,0(%ecx)
++        movl  %edx,4(%ecx)
++
++retstruct:
++        # Nothing to do!
++
++noretval:
++epilogue:
++	movl %esi,%eax # return the stack pointer detlta in %eax
++	popl %esi # restore previous %esi
++        movl %ebp,%esp
++        popl %ebp
++        ret
++
++.ffi_call_x86_end:
+diff -urN a/Modules/getaddrinfo.c b/Modules/getaddrinfo.c
+--- a/Modules/getaddrinfo.c	2013-05-12 04:32:51.000000000 +0100
++++ b/Modules/getaddrinfo.c	2013-05-17 23:57:26.937332670 +0100
+@@ -232,6 +232,9 @@
+     return YES;
+ }
+ 
++#ifndef EAI_BADHINTS
++#  define EAI_BADHINTS EAI_BADFLAGS
++#endif
+ int
+ getaddrinfo(const char*hostname, const char*servname,
+             const struct addrinfo *hints, struct addrinfo **res)
+diff -urN a/Modules/getnameinfo.c b/Modules/getnameinfo.c
+--- a/Modules/getnameinfo.c	2013-05-12 04:32:51.000000000 +0100
++++ b/Modules/getnameinfo.c	2013-05-17 23:57:26.937332670 +0100
+@@ -48,6 +48,14 @@
+ #include "addrinfo.h"
+ #endif
+ 
++#ifndef IN_EXPERIMENTAL
++#define IN_EXPERIMENTAL(i)  (((i) & 0xe0000000U) == 0xe0000000U)
++#endif
++
++#ifndef IN_LOOPBACKNET
++#define IN_LOOPBACKNET	    127
++#endif
++
+ #define SUCCESS 0
+ #define YES 1
+ #define NO  0
+diff -urN a/Modules/_io/fileio.c b/Modules/_io/fileio.c
+--- a/Modules/_io/fileio.c	2013-05-12 04:32:50.000000000 +0100
++++ b/Modules/_io/fileio.c	2013-05-17 23:57:26.938332682 +0100
+@@ -29,7 +29,9 @@
+ 
+ #ifdef MS_WINDOWS
+ /* can simulate truncate with Win32 API functions; see file_truncate */
++#ifndef HAVE_FTRUNCATE
+ #define HAVE_FTRUNCATE
++#endif
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
+ #endif
+diff -urN a/Modules/_localemodule.c b/Modules/_localemodule.c
+--- a/Modules/_localemodule.c	2013-05-12 04:32:50.000000000 +0100
++++ b/Modules/_localemodule.c	2013-05-17 23:57:26.938332682 +0100
+@@ -10,6 +10,13 @@
+ ******************************************************************/
+ 
+ #include "Python.h"
++#ifdef __MINGW32__
++/* The header libintl.h and library libintl may exist on mingw host.
++ * To be compatible with MSVC build we has to undef some defines.
++ */
++#undef HAVE_LIBINTL_H
++#undef HAVE_BIND_TEXTDOMAIN_CODESET
++#endif
+ 
+ #include <stdio.h>
+ #include <locale.h>
+diff -urN a/Modules/_math.c b/Modules/_math.c
+--- a/Modules/_math.c	2013-05-12 04:32:50.000000000 +0100
++++ b/Modules/_math.c	2013-05-17 23:57:26.938332682 +0100
+@@ -5,6 +5,29 @@
+ #include <float.h>
+ #include "_math.h"
+ 
++#if defined(__MINGW32__)
++#  define USE_MINGWEX_MATH
++#endif
++
++#ifdef USE_MINGWEX_MATH
++/* To avoid problems with many MSVCRT implementations we will
++ * use a work-around
++ */
++#define MAXLOG 7.09782712893383996843E2
++#define MINLOG -7.45133219101941108420E2
++
++static double fake_exp (double x) {
++  if (isnan(x)) { return(x); }
++  if (isinf(x)) { return(x > 0.0 ? x : 0.0); }
++  if (x > MAXLOG) { errno = ERANGE; return(INFINITY); }
++/* the correct code is to set ERANGE but why windows build bot don't fail ? */
++  if (x < MINLOG) { errno = ERANGE; return(0.0); }
++
++  return(exp(x));
++}
++#define exp	fake_exp
++#endif /*def USE_MINGWEX_MATH*/
++
+ /* The following copyright notice applies to the original
+    implementations of acosh, asinh and atanh. */
+ 
+@@ -179,9 +202,28 @@
+         if (u == 1.0)
+             return x;
+         else
++#if 0
+             return (u - 1.0) * x / log(u);
++#else
++        {   /* avoid precision error */
++            double r;
++            r = x / log(u);
++            return((u - 1.0) * r);
++        }
++#endif
+     }
+     else
++#ifdef USE_MINGWEX_MATH
++/* to avout errors with correct fake_exp:
++  expm10211:expm1(-1420.0): expected -1.0, got 'OverflowError'
++  expm10212:expm1(-1450.0): expected -1.0, got 'OverflowError'
++  expm10213:expm1(-1500.0): expected -1.0, got 'OverflowError'
++  expm10214:expm1(-1e+50): expected -1.0, got 'OverflowError'
++  expm10215:expm1(-1.79e+308): expected -1.0, got 'OverflowError'
++*/
++        if (x < MINLOG) { return(-1.0); }
++        else
++#endif
+         return exp(x) - 1.0;
+ }
+ 
+diff -urN a/Modules/mathmodule.c b/Modules/mathmodule.c
+--- a/Modules/mathmodule.c	2013-05-12 04:32:51.000000000 +0100
++++ b/Modules/mathmodule.c	2013-05-17 23:57:26.938332682 +0100
+@@ -60,6 +60,30 @@
+ extern double copysign(double, double);
+ #endif
+ 
++#if defined(__MINGW32__)
++#  define USE_MINGWEX_MATH
++#endif
++
++#ifdef USE_MINGWEX_MATH
++/* Since ldexp() is broken on many MSVCRT implementations and mingwex
++ * library provide a long double version we will use it as work-around.
++ * As example broken ldexp return for ldexp(1., INT_MAX) 0(zero) instead inf.
++ * With this work-around math test testLdexp pass.
++ */
++static double fake_ldexp (double x, int expn) { return ldexpl (x, expn); }
++#define ldexp	fake_ldexp
++
++/* Since pow() is broken on many MSVCRT implementations and library
++ * mingwex provide a long double version we will use it as work-around.
++ * As example broken pow return for pow(132.97585637020967, 126.95117632943295)
++ * 4.1252919849060512e+269 instead 4.1252919849057403e+269.
++ * With this work-around math test test_mtestfile pass for gamma.
++ */
++static double fake_pow (double x, double y) { return powl (x, y); }
++#define pow	fake_pow
++
++#endif /*def USE_MINGWEX_MATH*/
++
+ /*
+    sin(pi*x), giving accurate results for all finite x (especially x
+    integral or close to an integer).  This is here for use in the
+diff -urN a/Modules/_multiprocessing/multiprocessing.c b/Modules/_multiprocessing/multiprocessing.c
+--- a/Modules/_multiprocessing/multiprocessing.c	2013-05-12 04:32:50.000000000 +0100
++++ b/Modules/_multiprocessing/multiprocessing.c	2013-05-17 23:57:26.939332694 +0100
+@@ -332,6 +332,12 @@
+         Py_DECREF(temp); Py_DECREF(value); return; }              \
+     Py_DECREF(value)
+ 
++#ifndef MS_WINDOWS
++/* GCC(mingw) 4.4+ require and use posix threads(pthreads-w32)
++ * Also system may contain installed pthreads-w32.
++ * As multiprocessing is based on windows methods we must
++ * comment all those flags
++ */
+ #if defined(HAVE_SEM_OPEN) && !defined(POSIX_SEMAPHORES_NOT_ENABLED)
+     ADD_FLAG(HAVE_SEM_OPEN);
+ #endif
+@@ -345,8 +351,10 @@
+     ADD_FLAG(HAVE_BROKEN_SEM_GETVALUE);
+ #endif
+ #ifdef HAVE_BROKEN_SEM_UNLINK
++/* FIXME: why use this? Note before was for cygwin and darwin ? */
+     ADD_FLAG(HAVE_BROKEN_SEM_UNLINK);
+ #endif
++#endif /*ndef MS_WINDOWS*/
+     if (PyModule_AddObject(module, "flags", temp) < 0)
+         return;
+ }
+diff -urN a/Modules/posixmodule.c b/Modules/posixmodule.c
+--- a/Modules/posixmodule.c	2013-05-12 04:32:51.000000000 +0100
++++ b/Modules/posixmodule.c	2013-05-17 23:57:26.940332706 +0100
+@@ -131,6 +131,16 @@
+ #define HAVE_CWAIT      1
+ #define HAVE_FSYNC      1
+ #define fsync _commit
++#elif defined(__MINGW32__)	/* GCC (mingw special) compiler */
++/*#define HAVE_GETCWD	1 - detected by configure*/
++#define HAVE_SPAWNV	1
++/*#define HAVE_EXECV	1 - detected by configure*/
++#define HAVE_PIPE	1
++#define HAVE_POPEN	1
++#define HAVE_SYSTEM	1
++#define HAVE_CWAIT	1
++#define HAVE_FSYNC	1
++#define fsync _commit
+ #else
+ #if defined(PYOS_OS2) && defined(PYCC_GCC) || defined(__VMS)
+ /* Everything needed is defined in PC/os2emx/pyconfig.h or vms/pyconfig.h */
+@@ -259,7 +269,7 @@
+ #endif
+ #endif
+ 
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) || defined(__MINGW32__)
+ #ifdef HAVE_DIRECT_H
+ #include <direct.h>
+ #endif
+@@ -275,7 +285,7 @@
+ #include <shellapi.h>   /* for ShellExecute() */
+ #define popen   _popen
+ #define pclose  _pclose
+-#endif /* _MSC_VER */
++#endif /* _MSC_VER || __MINGW32__ */
+ 
+ #if defined(PYCC_VACPP) && defined(PYOS_OS2)
+ #include <io.h>
+@@ -575,7 +585,7 @@
+ */
+ #include <crt_externs.h>
+ static char **environ;
+-#elif !defined(_MSC_VER) && ( !defined(__WATCOMC__) || defined(__QNX__) )
++#elif !defined(_MSC_VER) && !defined(__MINGW32__) && ( !defined(__WATCOMC__) || defined(__QNX__) )
+ extern char **environ;
+ #endif /* !_MSC_VER */
+ 
+@@ -1515,6 +1525,13 @@
+ }
+ 
+ #ifdef MS_WINDOWS
++#ifdef __MINGW32__
++/* NOTE: All sample MSDN wincrypt programs include this header.
++ * It is required if we use mingw w32api.
++ * Why MSVC builds don't include it ?
++ */
++#  include <wincrypt.h>
++#endif
+ 
+ /* IsUNCRoot -- test whether the supplied path is of the form \\SERVER\SHARE\,
+    where / can be used in place of \ and the trailing slash is optional.
+@@ -9332,7 +9349,7 @@
+ }
+ 
+ 
+-#if (defined(_MSC_VER) || defined(__WATCOMC__) || defined(__BORLANDC__)) && !defined(__QNX__)
++#if (defined(_MSC_VER) || defined (__MINGW32__) || defined(__WATCOMC__) || defined(__BORLANDC__)) && !defined(__QNX__)
+ #define INITFUNC initnt
+ #define MODNAME "nt"
+ 
+diff -urN a/Modules/readline.c b/Modules/readline.c
+--- a/Modules/readline.c	2013-05-12 04:32:51.000000000 +0100
++++ b/Modules/readline.c	2013-05-17 23:57:26.976333131 +0100
+@@ -11,6 +11,11 @@
+ #include <errno.h>
+ #include <sys/time.h>
+ 
++#ifdef MS_WINDOWS
++/* on windows select don't work on files */
++#undef HAVE_SELECT
++#endif
++
+ #if defined(HAVE_SETLOCALE)
+ /* GNU readline() mistakenly sets the LC_CTYPE locale.
+  * This is evil.  Only the user or the app's main() should do this!
+@@ -892,6 +897,10 @@
+     /* Allow $if term= in .inputrc to work */
+     rl_terminal_name = getenv("TERM");
+ #endif
++#ifdef MS_WINDOWS
++    /* FIXME: need more test before to skip this hack */
++    rl_terminal_name = "dumb";
++#endif
+     /* Force rebind of TAB to insert-tab */
+     rl_bind_key('\t', rl_insert);
+     /* Bind both ESC-TAB and ESC-ESC to the completion function */
+@@ -1150,6 +1159,9 @@
+     if (m == NULL)
+         return;
+ 
++#ifndef MS_WINDOWS
++    /* FIXME: windows readline(prompt) may not work ? */
+     PyOS_ReadlineFunctionPointer = call_readline;
++#endif
+     setup_readline();
+ }
+diff -urN a/Modules/selectmodule.c b/Modules/selectmodule.c
+--- a/Modules/selectmodule.c	2013-05-12 04:32:51.000000000 +0100
++++ b/Modules/selectmodule.c	2013-05-17 23:57:26.978333154 +0100
+@@ -108,9 +108,10 @@
+         v = PyObject_AsFileDescriptor( o );
+         if (v == -1) goto finally;
+ 
+-#if defined(_MSC_VER)
++#if defined(_MSC_VER) || defined(__MINGW32__)
++/* FIXME: why not #ifdef Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE ? */
+         max = 0;                             /* not used for Win32 */
+-#else  /* !_MSC_VER */
++#else  /* !_MSC_VER & !__MINGW32__ */
+         if (!_PyIsSelectable_fd(v)) {
+             PyErr_SetString(PyExc_ValueError,
+                         "filedescriptor out of range in select()");
+@@ -118,7 +119,7 @@
+         }
+         if (v > max)
+             max = v;
+-#endif /* _MSC_VER */
++#endif /* _MSC_VER, __MINGW32__ */
+         FD_SET(v, set);
+ 
+         /* add object and its file descriptor to the list */
+diff -urN a/Modules/Setup.config.in b/Modules/Setup.config.in
+--- a/Modules/Setup.config.in	2013-05-12 04:32:49.000000000 +0100
++++ b/Modules/Setup.config.in	2013-05-17 23:57:26.979333166 +0100
+@@ -3,11 +3,22 @@
+ # The purpose of this file is to conditionally enable certain modules
+ # based on configure-time options.
+ 
++# init system calls(posix/nt/...) for INITFUNC (used by makesetup)
++@INITSYS@ posixmodule.c
++
+ # Threading
+ @USE_THREAD_MODULE@thread threadmodule.c
+ 
+ # The signal module
+ @USE_SIGNAL_MODULE@signal signalmodule.c
+ 
++# On win32 host(mingw build in MSYS environment) show that site.py
++# fail to load if some modules are not build-in:
++@BUILDIN_WIN32_MODULE@_functools _functoolsmodule.c	# Tools for working with functions and callable objects
++@BUILDIN_WIN32_MODULE@operator operator.c	# operator.add() and similar goodies
++@BUILDIN_WIN32_MODULE@_locale _localemodule.c	# -lintl
++@BUILDIN_WIN32_MODULE@_winreg ../PC/_winreg.c
++
++
+ # The rest of the modules previously listed in this file are built
+ # by the setup.py script in Python 2.1 and later.
+diff -urN a/Modules/Setup.dist b/Modules/Setup.dist
+--- a/Modules/Setup.dist	2013-05-12 04:32:49.000000000 +0100
++++ b/Modules/Setup.dist	2013-05-17 23:57:26.979333166 +0100
+@@ -112,9 +112,10 @@
+ # This only contains the minimal set of modules required to run the 
+ # setup.py script in the root of the Python source tree.
+ 
+-posix posixmodule.c		# posix (UNIX) system calls
+ errno errnomodule.c		# posix (UNIX) errno values
+-pwd pwdmodule.c			# this is needed to find out the user's home dir
++#FIXME: setup.py detect this module along with grp and spwd.
++#FIXME: what about to comment ?
++#pwd pwdmodule.c			# this is needed to find out the user's home dir
+ 				# if $HOME is not set
+ _sre _sre.c			# Fredrik Lundh's new regular expressions
+ _codecs _codecsmodule.c		# access to the builtin codecs and codec registry
+diff -urN a/Modules/signalmodule.c b/Modules/signalmodule.c
+--- a/Modules/signalmodule.c	2013-05-12 04:32:51.000000000 +0100
++++ b/Modules/signalmodule.c	2013-05-17 23:57:26.979333166 +0100
+@@ -7,7 +7,7 @@
+ #include "intrcheck.h"
+ 
+ #ifdef MS_WINDOWS
+-#include <Windows.h>
++#include <windows.h>
+ #ifdef HAVE_PROCESS_H
+ #include <process.h>
+ #endif
+diff -urN a/Modules/socketmodule.c b/Modules/socketmodule.c
+--- a/Modules/socketmodule.c	2013-05-12 04:32:51.000000000 +0100
++++ b/Modules/socketmodule.c	2013-05-17 23:57:26.980333178 +0100
+@@ -91,6 +91,15 @@
+ #endif
+ 
+ #include "Python.h"
++#ifndef HAVE_GETPEERNAME
++/* FIXME: see comments in configure.in. Also PC/pyconfig.h define it.
++ * Since only this module use getpeername why don't remove declaration
++ * from PC/pyconfig.h and define here if is defined MS_WIN32 ?
++ */
++#ifdef __MINGW32__
++#  define HAVE_GETPEERNAME
++#endif
++#endif /* ndef HAVE_GETPEERNAME */
+ #include "structmember.h"
+ #include "timefuncs.h"
+ 
+@@ -313,6 +322,35 @@
+   /* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and
+    * EAI_* constants are defined in (the already included) ws2tcpip.h.
+    */
++#elif defined(__MINGW32__)
++/* FIXME: getaddrinfo(HAVE_GETADDRINFO) depend from WINVER
++   TODO: resolve later(see comments in pyport.h) */
++#if 0
++/* To use getaddrinfo/getnameinfo from runtime for version before 0x0501
++   we has to define those functions (see below).
++   In all cases mingw linker succeed to link binaries.
++   If you enable this code the load of module will fail on w2k
++   with message like this one:
++   "The specified procedure could not be found" */
++#  if (_WIN32_WINNT < 0x0501)
++void WSAAPI freeaddrinfo (struct addrinfo*);
++int WSAAPI getaddrinfo (const char*,const char*,const struct addrinfo*,
++		        struct addrinfo**);
++int WSAAPI getnameinfo(const struct sockaddr*,socklen_t,char*,DWORD,
++		       char*,DWORD,int);
++#  endif
++#  define HAVE_GETADDRINFO
++#  define HAVE_GETNAMEINFO
++#else
++#  if (_WIN32_WINNT < 0x0501)
++   /* Internal implemetation that has to work on w2k and latest. */
++#    define EAI_ADDRFAMILY
++#    include "addrinfo.h"
++#  else
++#    define HAVE_GETADDRINFO
++#    define HAVE_GETNAMEINFO
++#  endif
++#endif
+ #else
+ #  include "addrinfo.h"
+ #endif
+@@ -350,6 +388,16 @@
+ #if !defined(HAVE_GETADDRINFO)
+ /* avoid clashes with the C library definition of the symbol. */
+ #define getaddrinfo fake_getaddrinfo
++#ifdef __MINGW32__
++#ifdef gai_strerror
++/* NOTE: Mingw w32api always define gai_strerror to gai_strerror{A|W}
++   but getaddrinfo is defined if _WIN32_WINNT >= 0x0501.
++   MSDN say that gai_strerror() exist for w95 and later and
++   getaddrinfo()/getnameinfo() for wxp and later.
++   Since we use fake function to suppress warnign we has to undef. */
++#  undef gai_strerror
++#endif
++#endif /*def __MINGW32__*/
+ #define gai_strerror fake_gai_strerror
+ #define freeaddrinfo fake_freeaddrinfo
+ #include "getaddrinfo.c"
+@@ -2986,7 +3034,31 @@
+ Shut down the reading side of the socket (flag == SHUT_RD), the writing side\n\
+ of the socket (flag == SHUT_WR), or both ends (flag == SHUT_RDWR).");
+ 
++#ifndef SIO_RCVALL
++#ifdef __MINGW32__
++/* MSDN: SIO_RCVALL defined on w2k and later */
++/* note "Separate SDKs" required for w2k    */
++/* 0x98000001 = _WSAIOW(IOC_VENDOR,1)       */
++#  define SIO_RCVALL	0x98000001
++#  define RCVALL_OFF	0
++#  define RCVALL_ON	1
++   /* NOTE: MSDN - this feature is not implemented */
++#  define RCVALL_SOCKETLEVELONLY	2
++
++/* 0x98000004 = _WSAIOW(IOC_VENDOR,4) */
++#  define SIO_KEEPALIVE_VALS	0x98000004
++struct tcp_keepalive {
++    u_long onoff;
++    u_long keepalivetime;
++    u_long keepaliveinterval;
++};
++#endif /* def __MINGW32__ */
++#endif /* ndef SIO_RCVALL */
++
+ #if defined(MS_WINDOWS) && defined(SIO_RCVALL)
++/* If isn't defined test_socket.py fail with:
++AttributeError: type object '_socket.socket' has no attribute 'ioctl'
++*/
+ static PyObject*
+ sock_ioctl(PySocketSockObject *s, PyObject *arg)
+ {
+diff -urN a/Modules/socketmodule.h b/Modules/socketmodule.h
+--- a/Modules/socketmodule.h	2013-05-12 04:32:51.000000000 +0100
++++ b/Modules/socketmodule.h	2013-05-17 23:57:26.980333178 +0100
+@@ -13,6 +13,13 @@
+ # endif
+ 
+ #else /* MS_WINDOWS */
++#ifdef socklen_t
++/* Configure script define to int on windows for GCC compiler.
++   Avoid GCC 4.4+ error (two or more data types in declaration specifiers)
++   as undef it first.
++ */
++# undef socklen_t
++#endif
+ # include <winsock2.h>
+ # include <ws2tcpip.h>
+ /* VC6 is shipped with old platform headers, and does not have MSTcpIP.h
+diff -urN a/Objects/fileobject.c b/Objects/fileobject.c
+--- a/Objects/fileobject.c	2013-05-12 04:32:52.000000000 +0100
++++ b/Objects/fileobject.c	2013-05-17 23:57:26.981333190 +0100
+@@ -9,9 +9,17 @@
+ #endif /* HAVE_SYS_TYPES_H */
+ 
+ #ifdef MS_WINDOWS
++#if !defined(__MINGW32__)
++/* avoid 'warning: "fileno" redefined' */
+ #define fileno _fileno
++#endif
+ /* can simulate truncate with Win32 API functions; see file_truncate */
++#ifndef HAVE_FTRUNCATE
++/* NOTE: autotool based build check and set it
++   FIXME: why isn't defined in PC/pyconfig.h ?
++ */
+ #define HAVE_FTRUNCATE
++#endif
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
+ #endif
+diff -urN a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c
+--- a/PC/msvcrtmodule.c	2013-05-12 04:32:52.000000000 +0100
++++ b/PC/msvcrtmodule.c	2013-05-17 23:57:26.981333190 +0100
+@@ -22,6 +22,31 @@
+ #include <conio.h>
+ #include <sys/locking.h>
+ 
++#if defined(__MINGW32__)
++#if __MSVCRT_VERSION__ >= 0x0700
++# define _WCONIO_DEFINED
++/* NOTE: Up to version ?.?? mingw don't define functions
++ * listed below. Also it require module to be linked with
++ * ms-vcrt at least verion 7.
++ * To build with different runtimes see:
++ *  http://www.mingw.org/wiki/HOWTO_Use_the_GCC_specs_file
++ *
++ * Also note that NT5.1(XP), shiped with msvcrt version 7.0,
++ * contain all those functions, but library name is msvcrt.dll.
++ * So if you like module to run on w2k as is you must define
++ * appropriate __MSVCRT_VERSION__ .
++ * If you like those functions even on w2k you must link
++ * with appropriate runtime and to pack it in distributions.
++ * This is what MSVC build do - it is build and packed
++ * with version 9.0 of Microsoft C-runtime.
++ */
++_CRTIMP wint_t __cdecl __MINGW_NOTHROW	_getwch (void);
++_CRTIMP wint_t __cdecl __MINGW_NOTHROW	_getwche (void);
++_CRTIMP wint_t __cdecl __MINGW_NOTHROW	_putwch (wchar_t);
++_CRTIMP wint_t __cdecl __MINGW_NOTHROW	_ungetwch(wint_t);
++#endif /* __MSVCRT_VERSION__ >= 0x0700 */
++#endif
++
+ #ifdef _MSC_VER
+ #if _MSC_VER >= 1500 && _MSC_VER < 1600
+ #include <crtassem.h>
+@@ -346,6 +371,7 @@
+     if (!PyArg_ParseTuple(args, "u:ungetwch", &ch))
+         return NULL;
+ 
++    /* FIXME: why _ungetch is called instead _ungetwch */
+     if (_ungetch(ch) == EOF)
+         return PyErr_SetFromErrno(PyExc_IOError);
+     Py_INCREF(Py_None);
+diff -urN a/PC/_winreg.c b/PC/_winreg.c
+--- a/PC/_winreg.c	2013-05-12 04:32:52.000000000 +0100
++++ b/PC/_winreg.c	2013-05-17 23:57:26.982333202 +0100
+@@ -17,6 +17,18 @@
+ #include "malloc.h" /* for alloca */
+ #include "windows.h"
+ 
++#if defined(__MINGW32__)
++_CRTIMP size_t __cdecl __MINGW_NOTHROW _mbstrlen(const char *s);
++#endif
++
++#if !defined(REG_LEGAL_CHANGE_FILTER)
++#define REG_LEGAL_CHANGE_FILTER                 \
++                (REG_NOTIFY_CHANGE_NAME          |\
++                 REG_NOTIFY_CHANGE_ATTRIBUTES    |\
++                 REG_NOTIFY_CHANGE_LAST_SET      |\
++                 REG_NOTIFY_CHANGE_SECURITY)
++#endif
++
+ static BOOL PyHKEY_AsHKEY(PyObject *ob, HKEY *pRes, BOOL bNoneOK);
+ static PyObject *PyHKEY_FromHKEY(HKEY h);
+ static BOOL PyHKEY_Close(PyObject *obHandle);
+@@ -1088,6 +1100,15 @@
+ static PyObject *
+ PyDeleteKeyEx(PyObject *self, PyObject *args)
+ {
++#ifndef KEY_WOW64_64KEY
++/* KEY_WOW64_64KEY is defined for _WIN32_WINNT >= 0x0502,
++  i.e. Windows Server 2003 with SP1, Windows XP with SP2
++  and not supported on w2k
++ */
++    PyErr_SetString(PyExc_NotImplementedError,
++                    "not implemented on this platform");
++    return NULL;
++#else /*def KEY_WOW64_64KEY*/
+     HKEY hKey;
+     PyObject *obKey;
+     HMODULE hMod;
+@@ -1123,6 +1144,7 @@
+         return PyErr_SetFromWindowsErrWithFunction(rc, "RegDeleteKeyEx");
+     Py_INCREF(Py_None);
+     return Py_None;
++#endif
+ }
+ 
+ static PyObject *
+diff -urN a/pyconfig.h.in b/pyconfig.h.in
+--- a/pyconfig.h.in	2013-05-12 04:32:54.000000000 +0100
++++ b/pyconfig.h.in	2013-05-17 23:57:26.982333202 +0100
+@@ -49,7 +49,7 @@
+ /* Define to 1 if you have the `acosh' function. */
+ #undef HAVE_ACOSH
+ 
+-/* struct addrinfo (netdb.h) */
++/* struct addrinfo */
+ #undef HAVE_ADDRINFO
+ 
+ /* Define to 1 if you have the `alarm' function. */
+@@ -900,6 +900,9 @@
+ /* Define to 1 if you have the `wcscoll' function. */
+ #undef HAVE_WCSCOLL
+ 
++/* Define to 1 if you have the <winsock2.h> header file. */
++#undef HAVE_WINSOCK2_H
++
+ /* Define if tzset() actually switches the local timezone in a meaningful way.
+    */
+ #undef HAVE_WORKING_TZSET
+@@ -927,6 +930,9 @@
+ /* Define if mvwdelch in curses.h is an expression. */
+ #undef MVWDELCH_IS_EXPRESSION
+ 
++/* Define to 1 if you want to use native NT threads */
++#undef NT_THREADS
++
+ /* Define to the address where bug reports for this package should be sent. */
+ #undef PACKAGE_BUGREPORT
+ 
+diff -urN a/Python/dynload_win.c b/Python/dynload_win.c
+--- a/Python/dynload_win.c	2013-05-12 04:32:53.000000000 +0100
++++ b/Python/dynload_win.c	2013-05-17 23:57:26.982333202 +0100
+@@ -11,9 +11,11 @@
+ #include "importdl.h"
+ #include <windows.h>
+ 
+-// "activation context" magic - see dl_nt.c...
++#ifdef Py_ENABLE_SHARED
++/* "activation context" magic - see dl_nt.c... */
+ extern ULONG_PTR _Py_ActivateActCtx();
+ void _Py_DeactivateActCtx(ULONG_PTR cookie);
++#endif
+ 
+ const struct filedescr _PyImport_DynLoadFiletab[] = {
+ #ifdef _DEBUG
+@@ -25,6 +27,12 @@
+ };
+ 
+ 
++#if defined(__MINGW32__)
++/* NOTE strcasecmp fail to compile with GCC for windows hosts
++ * with  error: conflicting types for 'strcasecmp'
++ */
++#  define strcasecmp fake_strcasecmp
++#endif
+ /* Case insensitive string compare, to avoid any dependencies on particular
+    C RTL implementations */
+ 
+@@ -190,11 +198,15 @@
+                             sizeof(pathbuf),
+                             pathbuf,
+                             &dummy)) {
++#ifdef Py_ENABLE_SHARED
+             ULONG_PTR cookie = _Py_ActivateActCtx();
++#endif
+             /* XXX This call doesn't exist in Windows CE */
+             hDLL = LoadLibraryEx(pathname, NULL,
+                                  LOAD_WITH_ALTERED_SEARCH_PATH);
++#ifdef Py_ENABLE_SHARED
+             _Py_DeactivateActCtx(cookie);
++#endif
+         }
+ 
+         /* restore old error mode settings */
+diff -urN a/Python/fileblocks.c b/Python/fileblocks.c
+--- a/Python/fileblocks.c	1970-01-01 01:00:00.000000000 +0100
++++ b/Python/fileblocks.c	2013-05-17 23:57:26.983333213 +0100
+@@ -0,0 +1,17 @@
++/*
++-- Macro: AC_STRUCT_ST_BLOCKS
++    If `struct stat' contains an `st_blocks' member, define
++    `HAVE_STRUCT_STAT_ST_BLOCKS'.  Otherwise, require an `AC_LIBOBJ'
++    replacement of `fileblocks'.
++*/
++
++#if !HAVE_STRUCT_STAT_ST_BLOCKS
++/* If necessary you may see gnulib for replacement function:
++off_t st_blocks (off_t size)
++You may found code available under GPL2 or GPL3.
++*/
++#else
++/* This declaration is solely to ensure that after preprocessing
++   this file is never empty.  */
++typedef int textutils_fileblocks_unused;
++#endif
+diff -urN a/Python/thread.c b/Python/thread.c
+--- a/Python/thread.c	2013-05-12 04:32:53.000000000 +0100
++++ b/Python/thread.c	2013-05-17 23:57:26.983333213 +0100
+@@ -7,6 +7,16 @@
+ 
+ #include "Python.h"
+ 
++#ifdef __MINGW32__
++/* GCC 4.4+ (mingw) support posix threads!
++  Note: macro __MINGW_GCC is defined for GCC 4.4+ but
++  not for GCC 3.4.5 (last stable from 3.x )
++  Instead to use __MINGW_GCC we will use more common
++  __MINGW32__ to prevent case when in GCC 3.4.5 build
++  envirionment is installed posix thread package.
++ */
++# undef HAVE_PTHREAD_H
++#endif
+ 
+ #ifndef _POSIX_THREADS
+ /* This means pthreads are not implemented in libc headers, hence the macro
+diff -urN a/setup.py b/setup.py
+--- a/setup.py	2013-05-12 04:32:54.000000000 +0100
++++ b/setup.py	2013-05-17 23:57:26.984333225 +0100
+@@ -179,7 +179,7 @@
+         # with Modules/ and adding Python's include directory to the path.
+         (srcdir,) = sysconfig.get_config_vars('srcdir')
+         if not srcdir:
+-            # Maybe running on Windows but not using CYGWIN?
++            # Maybe running on Windows but not using posix build?
+             raise ValueError("No source directory; cannot proceed.")
+         srcdir = os.path.abspath(srcdir)
+         moddirlist = [os.path.join(srcdir, 'Modules')]
+@@ -246,8 +246,38 @@
+         if compiler is not None:
+             (ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS')
+             args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags
++
++        # FIXME: Is next correct ?
++        # To link modules we need LDSHARED passed to setup.py otherwise
++        # distutils will use linker from build system if cross-compiling.
++        linker_so = os.environ.get('LDSHARED')
++        if linker_so is not None:
++            args['linker_so'] = linker_so
++
+         self.compiler.set_executables(**args)
+ 
++        if host_platform == 'win32':
++            # FIXME: best way to pass just build python library to the modules
++            self.compiler.library_dirs.insert(0, '.')
++            data = open('pyconfig.h').read()
++            m = re.search(r"#s*define\s+Py_DEBUG\s+1\s*", data)
++            if m is not None:
++                self.compiler.libraries.append("python" + str(sysconfig.get_config_var('VERSION')) + "_d")
++            else:
++                self.compiler.libraries.append("python" + str(sysconfig.get_config_var('VERSION')))
++
++        if host_platform == 'win32':
++            # NOTE: See comment for SHLIBS in configure.in .
++            # Although it look obsolete since setup.py add module
++            # required libraries we will pass list too.
++            # As example this will allow us to propage static
++            # libraries like mingwex to modules.
++            for lib in sysconfig.get_config_var('SHLIBS').split():
++                if lib.startswith('-l'):
++                    self.compiler.libraries.append(lib[2:])
++                else:
++                    self.compiler.libraries.append(lib)
++
+         build_ext.build_extensions(self)
+ 
+         longest = max([len(e.name) for e in self.extensions])
+@@ -482,6 +512,8 @@
+             # (PYTHONFRAMEWORK is set) to avoid # linking problems when
+             # building a framework with different architectures than
+             # the one that is currently installed (issue #7473)
++            # NOTE: revision 25103:[ #420565 ] add search in sys.prefix
++            # before current source tree !?!?!?! No comment!
+             add_dir_to_list(self.compiler.library_dirs,
+                             sysconfig.get_config_var("LIBDIR"))
+             add_dir_to_list(self.compiler.include_dirs,
+@@ -537,6 +569,7 @@
+             #   NOTE: using shlex.split would technically be more correct, but
+             # also gives a bootstrap problem. Let's hope nobody uses directories
+             # with whitespace in the name to store libraries.
++            # FIXME: Why LDFLAGS again ?
+             cflags, ldflags = sysconfig.get_config_vars(
+                     'CFLAGS', 'LDFLAGS')
+             for item in cflags.split():
+@@ -549,7 +582,7 @@
+ 
+         # Check for MacOS X, which doesn't need libm.a at all
+         math_libs = ['m']
+-        if host_platform in ['darwin', 'beos']:
++        if host_platform in ['darwin', 'beos', 'mingw', 'win32']:
+             math_libs = []
+ 
+         # XXX Omitted modules: gl, pure, dl, SGI-specific modules
+@@ -593,14 +626,20 @@
+         # heapq
+         exts.append( Extension("_heapq", ["_heapqmodule.c"]) )
+         # operator.add() and similar goodies
+-        exts.append( Extension('operator', ['operator.c']) )
++        # On win32 host(mingw build in MSYS environment) show that site.py
++        # fail to load if some modules are not build-in:
++        if host_platform not in ['mingw', 'win32']:
++            exts.append( Extension('operator', ['operator.c']) )
+         # Python 3.1 _io library
+         exts.append( Extension("_io",
+             ["_io/bufferedio.c", "_io/bytesio.c", "_io/fileio.c",
+              "_io/iobase.c", "_io/_iomodule.c", "_io/stringio.c", "_io/textio.c"],
+-             depends=["_io/_iomodule.h"], include_dirs=["Modules/_io"]))
++             depends=["_io/_iomodule.h"], include_dirs=[os.path.join(srcdir,"Modules/_io")]))
+         # _functools
+-        exts.append( Extension("_functools", ["_functoolsmodule.c"]) )
++        # On win32 host(mingw build in MSYS environment) show that site.py
++        # fail to load if some modules are not build-in:
++        if host_platform not in ['mingw', 'win32']:
++            exts.append( Extension("_functools", ["_functoolsmodule.c"]) )
+         # _json speedups
+         exts.append( Extension("_json", ["_json.c"]) )
+         # Python C API test module
+@@ -627,7 +666,10 @@
+             locale_extra_link_args = []
+ 
+ 
+-        exts.append( Extension('_locale', ['_localemodule.c'],
++        # On win32 host(mingw build in MSYS environment) show that site.py
++        # fail to load if some modules are not build-in:
++        if host_platform not in ['mingw', 'win32']:
++            exts.append( Extension('_locale', ['_localemodule.c'],
+                                libraries=locale_libs,
+                                extra_link_args=locale_extra_link_args) )
+ 
+@@ -636,24 +678,35 @@
+         # supported...)
+ 
+         # fcntl(2) and ioctl(2)
+-        libs = []
+-        if (config_h_vars.get('FLOCK_NEEDS_LIBBSD', False)):
+-            # May be necessary on AIX for flock function
+-            libs = ['bsd']
+-        exts.append( Extension('fcntl', ['fcntlmodule.c'], libraries=libs) )
+-        # pwd(3)
+-        exts.append( Extension('pwd', ['pwdmodule.c']) )
+-        # grp(3)
+-        exts.append( Extension('grp', ['grpmodule.c']) )
+-        # spwd, shadow passwords
+-        if (config_h_vars.get('HAVE_GETSPNAM', False) or
+-                config_h_vars.get('HAVE_GETSPENT', False)):
+-            exts.append( Extension('spwd', ['spwdmodule.c']) )
++        if host_platform not in ['mingw', 'win32']:
++            libs = []
++            if (config_h_vars.get('FLOCK_NEEDS_LIBBSD', False)):
++                # May be necessary on AIX for flock function
++                libs = ['bsd']
++            exts.append( Extension('fcntl', ['fcntlmodule.c'], libraries=libs) )
++        else:
++            missing.append('fcntl')
++        if host_platform not in ['mingw', 'win32']:
++            # pwd(3)
++            exts.append( Extension('pwd', ['pwdmodule.c']) )
++            # grp(3)
++            exts.append( Extension('grp', ['grpmodule.c']) )
++            # spwd, shadow passwords
++            if (config_h_vars.get('HAVE_GETSPNAM', False) or
++                    config_h_vars.get('HAVE_GETSPENT', False)):
++                exts.append( Extension('spwd', ['spwdmodule.c']) )
++            else:
++                missing.append('spwd')
+         else:
+-            missing.append('spwd')
++            missing.extend(['pwd', 'grp', 'spwd'])
+ 
+         # select(2); not on ancient System V
+-        exts.append( Extension('select', ['selectmodule.c']) )
++        if host_platform == 'win32':
++            select_libs = ['ws2_32']
++        else:
++            select_libs = []
++        exts.append( Extension('select', ['selectmodule.c'],
++                               libraries=select_libs) )
+ 
+         # Fred Drake's interface to the Python parser
+         exts.append( Extension('parser', ['parsermodule.c']) )
+@@ -669,8 +722,11 @@
+             missing.append('mmap')
+ 
+         # Lance Ellinghaus's syslog module
+-        # syslog daemon interface
+-        exts.append( Extension('syslog', ['syslogmodule.c']) )
++        if host_platform not in ['mingw', 'win32']:
++            # syslog daemon interface
++            exts.append( Extension('syslog', ['syslogmodule.c']) )
++        else:
++            missing.append('syslog')
+ 
+         # George Neville-Neil's timing module:
+         # Deprecated in PEP 4 http://www.python.org/peps/pep-0004.html
+@@ -772,15 +828,19 @@
+             libs = ['crypt']
+         else:
+             libs = []
+-        exts.append( Extension('crypt', ['cryptmodule.c'], libraries=libs) )
++        if libs != [] or host_platform not in ['mingw', 'win32']:
++            exts.append( Extension('crypt', ['cryptmodule.c'], libraries=libs) )
+ 
+         # CSV files
+         exts.append( Extension('_csv', ['_csv.c']) )
+ 
+         # socket(2)
++        _socket_libs = math_libs
++        if host_platform == 'win32':
++            _socket_libs.append('ws2_32')
+         exts.append( Extension('_socket', ['socketmodule.c', 'timemodule.c'],
+                                depends=['socketmodule.h'],
+-                               libraries=math_libs) )
++                               libraries=_socket_libs) )
+         # Detect SSL support for the socket module (via _ssl)
+         search_for_ssl_incs_in = [
+                               '/usr/local/ssl/include',
+@@ -801,10 +861,13 @@
+ 
+         if (ssl_incs is not None and
+             ssl_libs is not None):
++            _ssl_libs = ['ssl', 'crypto']
++            if host_platform in ('mingw', 'win32'):
++                _ssl_libs.append('ws2_32')
+             exts.append( Extension('_ssl', ['_ssl.c'],
+                                    include_dirs = ssl_incs,
+                                    library_dirs = ssl_libs,
+-                                   libraries = ['ssl', 'crypto'],
++                                   libraries = _ssl_libs,
+                                    depends = ['socketmodule.h']), )
+         else:
+             missing.append('_ssl')
+@@ -840,14 +903,17 @@
+             if have_usable_openssl:
+                 # The _hashlib module wraps optimized implementations
+                 # of hash functions from the OpenSSL library.
++                # NOTE: _hashlib require only OpenSSL crypto library !
+                 exts.append( Extension('_hashlib', ['_hashopenssl.c'],
+                                        include_dirs = ssl_incs,
+                                        library_dirs = ssl_libs,
+-                                       libraries = ['ssl', 'crypto']) )
++                                       libraries = ['crypto']) )
+             else:
+                 print ("warning: openssl 0x%08x is too old for _hashlib" %
+                        openssl_ver)
+                 missing.append('_hashlib')
++        # NOTE: MSVC build alwais include _md5 and _sha modules
++        # as build-in modules
+         if COMPILED_WITH_PYDEBUG or not have_usable_openssl:
+             # The _sha module implements the SHA1 hash algorithm.
+             exts.append( Extension('_sha', ['shamodule.c']) )
+@@ -883,6 +949,29 @@
+         min_db_ver = (4, 3)
+         db_setup_debug = False   # verbose debug prints from this script?
+ 
++        # Modules with some Windows dependencies:
++        if host_platform == 'win32':
++            srcdir = sysconfig.get_config_var('srcdir')
++            pc_srcdir = os.path.abspath(os.path.join(srcdir, 'PC'))
++
++            exts.append( Extension('msvcrt', [os.path.join(pc_srcdir, p)
++                for p in ['msvcrtmodule.c']]) )
++
++            exts.append( Extension('_msi', [os.path.join(pc_srcdir, p)
++                for p in ['_msi.c']]) )
++
++            exts.append( Extension('_subprocess', [os.path.join(pc_srcdir, p)
++                for p in ['_subprocess.c']]) )
++
++            # On win32 host(mingw build in MSYS environment) show that site.py
++            # fail to load if some modules are not build-in:
++            #exts.append( Extension('_winreg', [os.path.join(pc_srcdir, p)
++            #    for p in ['_winreg.c']]) )
++
++            exts.append( Extension('winsound', [os.path.join(pc_srcdir, p)
++                for p in ['winsound.c']],
++                libraries=['winmm']) )
++
+         def allow_db_ver(db_ver):
+             """Returns a boolean if the given BerkeleyDB version is acceptable.
+ 
+@@ -1162,6 +1251,7 @@
+                 '_sqlite/util.c', ]
+ 
+             sqlite_defines = []
++            #NOTE: don't add mingw here
+             if host_platform != "win32":
+                 sqlite_defines.append(('MODULE_NAME', '"sqlite3"'))
+             else:
+@@ -1304,7 +1394,8 @@
+                 missing.append('dbm')
+ 
+         # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
+-        if ('gdbm' in dbm_order and
++        if (host_platform not in ['mingw', 'win32'] and
++            'gdbm' in dbm_order and
+             self.compiler.find_library_file(lib_dirs, 'gdbm')):
+             exts.append( Extension('gdbm', ['gdbmmodule.c'],
+                                    libraries = ['gdbm'] ) )
+@@ -1312,7 +1403,7 @@
+             missing.append('gdbm')
+ 
+         # Unix-only modules
+-        if host_platform not in ['win32']:
++        if host_platform not in ['mingw', 'win32']:
+             # Steen Lumholt's termios module
+             exts.append( Extension('termios', ['termios.c']) )
+             # Jeremy Hylton's rlimit interface
+@@ -1518,7 +1609,7 @@
+         if sys.maxint == 0x7fffffff:
+             # This requires sizeof(int) == sizeof(long) == sizeof(char*)
+             dl_inc = find_file('dlfcn.h', [], inc_dirs)
+-            if (dl_inc is not None) and (host_platform not in ['atheos']):
++            if (dl_inc is not None) and (host_platform not in ['atheos', 'mingw', 'win32']):
+                 exts.append( Extension('dl', ['dlmodule.c']) )
+             else:
+                 missing.append('dl')
+@@ -1529,7 +1620,7 @@
+         self.detect_ctypes(inc_dirs, lib_dirs)
+ 
+         # Richard Oudkerk's multiprocessing module
+-        if host_platform == 'win32':             # Windows
++        if host_platform == 'win32':  # Windows
+             macros = dict()
+             libraries = ['ws2_32']
+ 
+@@ -1557,7 +1648,9 @@
+ 
+         else:                                   # Linux and other unices
+             macros = dict()
+-            libraries = ['rt']
++            # NOTE: line below is never used before to add MINGW platform
++            #libraries = ['rt']
++            libraries = []
+ 
+         if host_platform == 'win32':
+             multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
+@@ -1576,7 +1669,9 @@
+                 multiprocessing_srcs.append('_multiprocessing/semaphore.c')
+ 
+         if sysconfig.get_config_var('WITH_THREAD'):
++            #FIXME: why above set libraries aren't used ?
+             exts.append ( Extension('_multiprocessing', multiprocessing_srcs,
++                                    libraries=libraries,
+                                     define_macros=macros.items(),
+                                     include_dirs=["Modules/_multiprocessing"]))
+         else:
+@@ -1617,6 +1712,7 @@
+         if host_platform == 'darwin' and ("--disable-toolbox-glue" not in
+                 sysconfig.get_config_var("CONFIG_ARGS")):
+ 
++            #FIXME: next fail in cross-compilation environment
+             if int(os.uname()[2].split('.')[0]) >= 8:
+                 # We're on Mac OS X 10.4 or later, the compiler should
+                 # support '-Wno-deprecated-declarations'. This will
+@@ -1862,6 +1958,9 @@
+         if host_platform == 'sunos5':
+             include_dirs.append('/usr/openwin/include')
+             added_lib_dirs.append('/usr/openwin/lib')
++        elif host_platform == 'win32':
++            # mingw&win32 don't use X11 headers and libraries
++            pass
+         elif os.path.exists('/usr/X11R6/include'):
+             include_dirs.append('/usr/X11R6/include')
+             added_lib_dirs.append('/usr/X11R6/lib64')
+@@ -1897,8 +1996,8 @@
+         if host_platform in ['aix3', 'aix4']:
+             libs.append('ld')
+ 
+-        # Finally, link with the X11 libraries (not appropriate on cygwin)
+-        if host_platform != "cygwin":
++        # Finally, link with the X11 libraries (not appropriate on cygwin, mingw)
++        if not host_platform in ['cygwin', 'mingw', 'win32']:
+             libs.append('X11')
+ 
+         ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
+@@ -1949,6 +2048,38 @@
+         return True
+ 
+     def configure_ctypes(self, ext):
++        if host_platform == 'win32':
++            # win32 platform use own sources and includes
++            # from Modules/_ctypes/libffi_msvc/
++            srcdir = sysconfig.get_config_var('srcdir')
++
++            ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
++                                         '_ctypes'))
++            sources = [os.path.join(ffi_srcdir, p)
++                for p in ['malloc_closure.c',
++                         ]]
++            ext.sources.extend(sources)
++
++            ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
++                                         '_ctypes', 'libffi_msvc'))
++            #FIXME: _ctypes/libffi_msvc/win64.asm ?
++            sources = [os.path.join(ffi_srcdir, p)
++                for p in ['ffi.c',
++                          'prep_cif.c',
++                          'win32.S',
++                         ]]
++            # NOTE: issue2942 don't resolve problem with assembler code.
++            # It seems to me that python refuse to build an extension
++            # if exist a source with unknown suffix.
++            self.compiler.src_extensions.append('.s')
++            self.compiler.src_extensions.append('.S')
++            ext.include_dirs.append(ffi_srcdir)
++            ext.sources.extend(sources)
++            ext.libraries.extend(['ole32', 'oleaut32', 'uuid'])
++            #AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
++            ext.export_symbols.extend(['DllGetClassObject PRIVATE',
++                                       'DllCanUnloadNow PRIVATE'])
++            return True
+         if not self.use_system_libffi:
+             if host_platform == 'darwin':
+                 return self.configure_ctypes_darwin(ext)
+@@ -1999,6 +2130,11 @@
+                                fficonfig['ffi_sources'])
+             ext.include_dirs.extend(include_dirs)
+             ext.extra_compile_args.extend(extra_compile_args)
++            if host_platform == 'win32':
++                ext.libraries.extend(['ole32', 'oleaut32', 'uuid'])
++                #AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
++                ext.export_symbols.extend(['DllGetClassObject PRIVATE',
++                                           'DllCanUnloadNow PRIVATE'])
+         return True
+ 
+     def detect_ctypes(self, inc_dirs, lib_dirs):
+@@ -2042,7 +2178,12 @@
+                         libraries=[],
+                         sources=sources,
+                         depends=depends)
++        if host_platform == 'win32':
++            ctypes_test_libs = ['oleaut32']
++        else:
++            ctypes_test_libs = []
+         ext_test = Extension('_ctypes_test',
++                             libraries=ctypes_test_libs,
+                              sources=['_ctypes/_ctypes_test.c'])
+         self.extensions.extend([ext, ext_test])
+ 
diff --git a/mingw-w64-python2/0006-mingw-removal-of-libffi-patch.patch b/mingw-w64-python2/0006-mingw-removal-of-libffi-patch.patch
new file mode 100644
index 0000000000..50bb3315ac
--- /dev/null
+++ b/mingw-w64-python2/0006-mingw-removal-of-libffi-patch.patch
@@ -0,0 +1,248 @@
+diff -urN a/Lib/ctypes/test/test_as_parameter.py b/Lib/ctypes/test/test_as_parameter.py
+--- a/Lib/ctypes/test/test_as_parameter.py	2013-05-17 23:57:27.580340242 +0100
++++ b/Lib/ctypes/test/test_as_parameter.py	2013-05-17 23:57:27.846343373 +0100
+@@ -1,7 +1,6 @@
+ import unittest
+ from ctypes import *
+ import _ctypes_test
+-import sys
+ 
+ dll = CDLL(_ctypes_test.__file__)
+ 
+@@ -172,10 +171,6 @@
+         s2h = dll.ret_2h_func(self.wrap(inp))
+         self.assertEqual((s2h.x, s2h.y), (99*2, 88*3))
+ 
+-    # This is known cdecl incompatibility between GCC
+-    # and MSVC. It is addressed in GCC issue #36834.
+-    # Python libffi detect it and complain.
+-    @unittest.skipIf(sys.platform == "win32" and sys.version.find("GCC") >= 0, 'XFAIL GCC(mingw)')
+     def test_struct_return_8H(self):
+         class S8I(Structure):
+             _fields_ = [("a", c_int),
+diff -urN a/Lib/ctypes/test/test_functions.py b/Lib/ctypes/test/test_functions.py
+--- a/Lib/ctypes/test/test_functions.py	2013-05-17 23:57:27.579340230 +0100
++++ b/Lib/ctypes/test/test_functions.py	2013-05-17 23:57:27.848343397 +0100
+@@ -359,10 +359,6 @@
+             s2h = windll.s_ret_2h_func(S2H(99, 88))
+             self.assertEqual((s2h.x, s2h.y), (99*2, 88*3))
+ 
+-    # This is known cdecl incompatibility between GCC
+-    # and MSVC. It is addressed in GCC issue #36834.
+-    # Python libffi detect it and complain.
+-    @unittest.skipIf(sys.platform == "win32" and sys.version.find("GCC") >= 0, 'XFAIL GCC(mingw)')
+     def test_struct_return_8H(self):
+         class S8I(Structure):
+             _fields_ = [("a", c_int),
+diff -urN a/Modules/_ctypes/libffi_msvc/win32.S b/Modules/_ctypes/libffi_msvc/win32.S
+--- a/Modules/_ctypes/libffi_msvc/win32.S	2013-05-17 23:57:27.355337593 +0100
++++ b/Modules/_ctypes/libffi_msvc/win32.S	1970-01-01 01:00:00.000000000 +0100
+@@ -1,154 +0,0 @@
+-/* -----------------------------------------------------------------------
+-   win32.S - Copyright (c) 1996, 1998, 2001, 2002  Red Hat, Inc.
+-	     Copyright (c) 2001  John Beniton
+-	     Copyright (c) 2002  Ranjit Mathew
+-
+-
+-   X86 Foreign Function Interface
+-
+-   Permission is hereby granted, free of charge, to any person obtaining
+-   a copy of this software and associated documentation files (the
+-   ``Software''), to deal in the Software without restriction, including
+-   without limitation the rights to use, copy, modify, merge, publish,
+-   distribute, sublicense, and/or sell copies of the Software, and to
+-   permit persons to whom the Software is furnished to do so, subject to
+-   the following conditions:
+-
+-   The above copyright notice and this permission notice shall be included
+-   in all copies or substantial portions of the Software.
+-
+-   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
+-   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+-   IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+-   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+-   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+-   OTHER DEALINGS IN THE SOFTWARE.
+-   ----------------------------------------------------------------------- */
+-
+-#define LIBFFI_ASM
+-#include <fficonfig.h>
+-#include <ffi.h>
+-
+-.text
+-
+-.globl ffi_prep_args
+-
+-        # This assumes we are using gas.
+-        .balign 16
+-.globl _ffi_call_x86
+-
+-_ffi_call_x86:
+-        pushl %ebp
+-        movl  %esp,%ebp
+-
+-	#THe: save previous %esi, and store the current stack pointer in %esi
+-	pushl %esi
+-	movl %esp,%esi
+-
+-        # Make room for all of the new args.
+-        movl  16(%ebp),%ecx
+-        subl  %ecx,%esp
+-
+-        movl  %esp,%eax
+-
+-        # Place all of the ffi_prep_args in position
+-        pushl 12(%ebp)
+-        pushl %eax
+-        call  *8(%ebp)
+-
+-        # Return stack to previous state and call the function
+-        addl  $8,%esp
+-
+-        # FIXME: Align the stack to a 128-bit boundary to avoid
+-        # potential performance hits.
+-
+-	call  *28(%ebp)
+-
+-	# Load ecif->cif->abi
+-#masm#	mov ecx, [ebp + 12]
+-        movl  12(%ebp),%ecx
+-#masm#	mov ecx, [ecx]ecif.cif
+-	movl  (%ecx),%ecx
+-#masm#	mov ecx, [ecx]ecif.cif.abi
+-	movl  (%ecx),%ecx
+-#masm#	cmp ecx, FFI_STDCALL
+-        cmpl  $2,%ecx
+-        je   noclean
+-
+-	# STDCALL: Remove the space we pushed for the args
+-        movl  16(%ebp),%ecx
+-        addl  %ecx,%esp
+-
+-	# CDECL: Caller has already cleaned the stack
+-noclean:
+-	# Check that esp has the same value as before!
+-	sub %esp,%esi # calculate stack pointer difference
+-
+-        # Load %ecx with the return type code
+-        movl  20(%ebp),%ecx
+-
+-        # If the return value pointer is NULL, assume no return value.
+-        cmpl  $0,24(%ebp)
+-        jne   retint
+-
+-        # Even if there is no space for the return value, we are
+-        # obliged to handle floating-point values.
+-        cmpl  $FFI_TYPE_FLOAT,%ecx
+-        jne   noretval
+-        fstp  %st(0)
+-
+-        jmp   epilogue
+-
+-retint:
+-        cmpl  $FFI_TYPE_INT,%ecx
+-        jne   retfloat
+-        # Load %ecx with the pointer to storage for the return value
+-        movl  24(%ebp),%ecx
+-        movl  %eax,0(%ecx)
+-        jmp   epilogue
+-
+-retfloat:
+-        cmpl  $FFI_TYPE_FLOAT,%ecx
+-        jne   retdouble
+-         # Load %ecx with the pointer to storage for the return value
+-        movl  24(%ebp),%ecx
+-        fstps (%ecx)
+-        jmp   epilogue
+-
+-retdouble:
+-        cmpl  $FFI_TYPE_DOUBLE,%ecx
+-        jne   retlongdouble
+-        # Load %ecx with the pointer to storage for the return value
+-        movl  24(%ebp),%ecx
+-        fstpl (%ecx)
+-        jmp   epilogue
+-
+-retlongdouble:
+-        cmpl  $FFI_TYPE_LONGDOUBLE,%ecx
+-        jne   retint64
+-        # Load %ecx with the pointer to storage for the return value
+-        movl  24(%ebp),%ecx
+-        fstpt (%ecx)
+-        jmp   epilogue
+-
+-retint64:
+-        cmpl  $FFI_TYPE_SINT64,%ecx
+-        jne   retstruct
+-        # Load %ecx with the pointer to storage for the return value
+-        movl  24(%ebp),%ecx
+-        movl  %eax,0(%ecx)
+-        movl  %edx,4(%ecx)
+-
+-retstruct:
+-        # Nothing to do!
+-
+-noretval:
+-epilogue:
+-	movl %esi,%eax # return the stack pointer detlta in %eax
+-	popl %esi # restore previous %esi
+-        movl %ebp,%esp
+-        popl %ebp
+-        ret
+-
+-.ffi_call_x86_end:
+diff -urN a/setup.py b/setup.py
+--- a/setup.py	2013-05-17 23:57:27.406338193 +0100
++++ b/setup.py	2013-05-17 23:57:27.850343420 +0100
+@@ -2048,38 +2048,6 @@
+         return True
+ 
+     def configure_ctypes(self, ext):
+-        if host_platform == 'win32':
+-            # win32 platform use own sources and includes
+-            # from Modules/_ctypes/libffi_msvc/
+-            srcdir = sysconfig.get_config_var('srcdir')
+-
+-            ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
+-                                         '_ctypes'))
+-            sources = [os.path.join(ffi_srcdir, p)
+-                for p in ['malloc_closure.c',
+-                         ]]
+-            ext.sources.extend(sources)
+-
+-            ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
+-                                         '_ctypes', 'libffi_msvc'))
+-            #FIXME: _ctypes/libffi_msvc/win64.asm ?
+-            sources = [os.path.join(ffi_srcdir, p)
+-                for p in ['ffi.c',
+-                          'prep_cif.c',
+-                          'win32.S',
+-                         ]]
+-            # NOTE: issue2942 don't resolve problem with assembler code.
+-            # It seems to me that python refuse to build an extension
+-            # if exist a source with unknown suffix.
+-            self.compiler.src_extensions.append('.s')
+-            self.compiler.src_extensions.append('.S')
+-            ext.include_dirs.append(ffi_srcdir)
+-            ext.sources.extend(sources)
+-            ext.libraries.extend(['ole32', 'oleaut32', 'uuid'])
+-            #AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
+-            ext.export_symbols.extend(['DllGetClassObject PRIVATE',
+-                                       'DllCanUnloadNow PRIVATE'])
+-            return True
+         if not self.use_system_libffi:
+             if host_platform == 'darwin':
+                 return self.configure_ctypes_darwin(ext)
+@@ -2130,11 +2098,6 @@
+                                fficonfig['ffi_sources'])
+             ext.include_dirs.extend(include_dirs)
+             ext.extra_compile_args.extend(extra_compile_args)
+-            if host_platform == 'win32':
+-                ext.libraries.extend(['ole32', 'oleaut32', 'uuid'])
+-                #AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
+-                ext.export_symbols.extend(['DllGetClassObject PRIVATE',
+-                                           'DllCanUnloadNow PRIVATE'])
+         return True
+ 
+     def detect_ctypes(self, inc_dirs, lib_dirs):
diff --git a/mingw-w64-python2/0007-mingw-system-libffi.patch b/mingw-w64-python2/0007-mingw-system-libffi.patch
new file mode 100644
index 0000000000..65bc3b4fc1
--- /dev/null
+++ b/mingw-w64-python2/0007-mingw-system-libffi.patch
@@ -0,0 +1,173 @@
+diff -urN a/configure.ac b/configure.ac
+--- a/configure.ac	2013-05-17 23:57:28.169347170 +0100
++++ b/configure.ac	2013-05-17 23:57:28.529351397 +0100
+@@ -2399,14 +2399,32 @@
+             [],
+             [with_system_ffi="no"])
+ 
+-if test "$with_system_ffi" = "yes" && test -n "$PKG_CONFIG"; then
+-    LIBFFI_INCLUDEDIR="`"$PKG_CONFIG" libffi --cflags-only-I 2>/dev/null | sed -e 's/^-I//;s/ *$//'`"
++if test "$with_system_ffi" = "yes"; then
++    LIBFFI_INCLUDEDIR="$LIBFFI_INCLUDEDIR"
++fi
++AC_MSG_RESULT($with_system_ffi)
++
++ac_previous_cppflags=$CPPFLAGS
++CPPFLAGS="-I$LIBFFI_INCLUDEDIR"
++ac_previous_ldflags=$LDFLAGS
++# check for ffi.h
++AC_CHECK_HEADER(ffi.h, [
++  AC_DEFINE(WITH_SYSTEM_LIBFFI, 1,
++  [Define if we have external libffi.])
++  ffi_h="yes"
++],
++ffi_h="no"
++)
++if test "$ffi_h" = "yes"; then
++    LIBFFI_INCLUDEDIR="$LIBFFI_INCLUDEDIR"
+ else
+     LIBFFI_INCLUDEDIR=""
+ fi
++CPPFLAGS=$ac_previous_cppflags
++LDFLAGS=$ac_previous_ldflags
+ AC_SUBST(LIBFFI_INCLUDEDIR)
+ 
+-AC_MSG_RESULT($with_system_ffi)
++
+ 
+ # Check for --with-dbmliborder
+ AC_MSG_CHECKING(for --with-dbmliborder)
+diff -urN a/Lib/ctypes/test/test_as_parameter.py b/Lib/ctypes/test/test_as_parameter.py
+--- a/Lib/ctypes/test/test_as_parameter.py	2013-05-17 23:57:28.270348356 +0100
++++ b/Lib/ctypes/test/test_as_parameter.py	2013-05-17 23:57:28.530351409 +0100
+@@ -1,6 +1,7 @@
+ import unittest
+ from ctypes import *
+ import _ctypes_test
++import sys
+ 
+ dll = CDLL(_ctypes_test.__file__)
+ 
+@@ -171,6 +172,10 @@
+         s2h = dll.ret_2h_func(self.wrap(inp))
+         self.assertEqual((s2h.x, s2h.y), (99*2, 88*3))
+ 
++    # This is known cdecl incompatibility between GCC
++    # and MSVC. It is addressed in GCC issue #36834.
++    # Python libffi detect it and complain.
++    @unittest.skipIf(sys.platform == "win32" and sys.version.find("GCC") >= 0, 'XFAIL GCC(mingw)')
+     def test_struct_return_8H(self):
+         class S8I(Structure):
+             _fields_ = [("a", c_int),
+diff -urN a/Lib/ctypes/test/test_functions.py b/Lib/ctypes/test/test_functions.py
+--- a/Lib/ctypes/test/test_functions.py	2013-05-17 23:57:28.270348356 +0100
++++ b/Lib/ctypes/test/test_functions.py	2013-05-17 23:57:28.530351409 +0100
+@@ -359,6 +359,10 @@
+             s2h = windll.s_ret_2h_func(S2H(99, 88))
+             self.assertEqual((s2h.x, s2h.y), (99*2, 88*3))
+ 
++    # This is known cdecl incompatibility between GCC
++    # and MSVC. It is addressed in GCC issue #36834.
++    # Python libffi detect it and complain.
++    @unittest.skipIf(sys.platform == "win32" and sys.version.find("GCC") >= 0, 'XFAIL GCC(mingw)')
+     def test_struct_return_8H(self):
+         class S8I(Structure):
+             _fields_ = [("a", c_int),
+diff -urN a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
+--- a/Modules/_ctypes/callproc.c	2013-05-17 23:57:28.104346407 +0100
++++ b/Modules/_ctypes/callproc.c	2013-05-17 23:57:28.531351420 +0100
+@@ -827,8 +827,10 @@
+ #ifndef DONT_USE_SEH
+     __try {
+ #endif
++#ifndef __MINGW32__
+         delta =
+ #endif
++#endif
+                 ffi_call(&cif, (void *)pProc, resmem, avalues);
+ #ifdef MS_WIN32
+ #ifndef DONT_USE_SEH
+@@ -861,6 +863,7 @@
+         return -1;
+     }
+ #endif
++#ifndef __MINGW32__
+ #ifdef MS_WIN64
+     if (delta != 0) {
+         PyErr_Format(PyExc_RuntimeError,
+@@ -891,6 +894,7 @@
+     }
+ #endif
+ #endif
++#endif
+     if ((flags & FUNCFLAG_PYTHONAPI) && PyErr_Occurred())
+         return -1;
+     return 0;
+diff -urN a/Modules/_ctypes/libffi/fficonfig.py.in b/Modules/_ctypes/libffi/fficonfig.py.in
+--- a/Modules/_ctypes/libffi/fficonfig.py.in	2013-05-17 23:57:28.115346536 +0100
++++ b/Modules/_ctypes/libffi/fficonfig.py.in	2013-05-17 23:57:28.531351420 +0100
+@@ -23,6 +22,7 @@
+     'FRV': ['src/frv/eabi.S', 'src/frv/ffi.c'],
+     'S390': ['src/s390/sysv.S', 'src/s390/ffi.c'],
+     'X86_64': ['src/x86/ffi64.c', 'src/x86/unix64.S', 'src/x86/ffi.c', 'src/x86/sysv.S'],
++    'X86_WIN64': ['src/x86/ffi.c', 'src/x86/win64.S'],
+     'SH': ['src/sh/sysv.S', 'src/sh/ffi.c'],
+     'SH64': ['src/sh64/sysv.S', 'src/sh64/ffi.c'],
+     'PA': ['src/pa/linux.S', 'src/pa/ffi.c'],
+@@ -30,6 +30,9 @@
+     'PA_HPUX': ['src/pa/hpux32.S', 'src/pa/ffi.c'],
+ }
+ 
++ffi_target = '@TARGET@'
++if ffi_target not in ['X86_WIN32', 'X86_WIN64']:
++    ffi_sources += ['src/dlmalloc.c']
+ ffi_sources += ffi_platforms['@TARGET@']
+ 
+ ffi_cflags = '@CFLAGS@'
+diff -urN a/pyconfig.h.in b/pyconfig.h.in
+--- a/pyconfig.h.in	2013-05-17 23:57:28.191347429 +0100
++++ b/pyconfig.h.in	2013-05-17 23:57:28.531351420 +0100
+@@ -1116,6 +1116,9 @@
+ /* Define if you want to compile in Python-specific mallocs */
+ #undef WITH_PYMALLOC
+ 
++/* Define if we have external libffi. */
++#undef WITH_SYSTEM_LIBFFI
++
+ /* Define if you want to compile in rudimentary thread support */
+ #undef WITH_THREAD
+ 
+diff -urN a/setup.py b/setup.py
+--- a/setup.py	2013-05-17 23:57:28.156347018 +0100
++++ b/setup.py	2013-05-17 23:57:28.532351432 +0100
+@@ -16,6 +16,7 @@
+ from distutils.command.install import install
+ from distutils.command.install_lib import install_lib
+ from distutils.spawn import find_executable
++from string import maketrans
+ 
+ cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ
+ 
+@@ -2048,6 +2049,11 @@
+         return True
+ 
+     def configure_ctypes(self, ext):
++        if host_platform == 'win32':
++            ext.libraries.extend(['ole32', 'oleaut32', 'uuid'])
++            #AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
++            ext.export_symbols.extend(['DllGetClassObject PRIVATE',
++                                       'DllCanUnloadNow PRIVATE'])
+         if not self.use_system_libffi:
+             if host_platform == 'darwin':
+                 return self.configure_ctypes_darwin(ext)
+@@ -2072,6 +2078,10 @@
+                 if not self.verbose:
+                     config_args.append("-q")
+ 
++                if host_platform == 'win32':
++                    table = maketrans('\\', '/')
++                    ffi_builddir = ffi_builddir.translate(table)
++                    ffi_srcdir = ffi_srcdir.translate(table)
+                 # Pass empty CFLAGS because we'll just append the resulting
+                 # CFLAGS to Python's; -g or -O2 is to be avoided.
+                 cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
diff --git a/mingw-w64-python2/0010-mingw-osdefs-DELIM.patch b/mingw-w64-python2/0010-mingw-osdefs-DELIM.patch
new file mode 100644
index 0000000000..e8b59a3e3a
--- /dev/null
+++ b/mingw-w64-python2/0010-mingw-osdefs-DELIM.patch
@@ -0,0 +1,111 @@
+diff -urN a/configure.ac b/configure.ac
+--- a/configure.ac	2013-05-17 23:57:28.858355259 +0100
++++ b/configure.ac	2013-05-17 23:57:29.219359491 +0100
+@@ -493,6 +493,16 @@
+ fi
+ AC_MSG_RESULT($MACHDEP)
+ 
++# Windows uses ; to separate paths, everything else uses :
++AC_MSG_CHECKING(DELIM)
++DELIM=:
++if test "$MACHDEP" = "win32"
++then
++       DELIM=\;
++fi
++AC_MSG_RESULT([$DELIM])
++AC_SUBST(DELIM)
++
+ AC_MSG_CHECKING([for init system calls])
+ AC_SUBST(INITSYS)
+ case $host in
+diff -urN a/Include/osdefs.h b/Include/osdefs.h
+--- a/Include/osdefs.h	2013-05-17 23:57:28.856355236 +0100
++++ b/Include/osdefs.h	2013-05-17 23:57:29.220359502 +0100
+@@ -10,7 +10,7 @@
+ /* Mod by chrish: QNX has WATCOM, but isn't DOS */
+ #if !defined(__QNX__)
+ #if defined(MS_WINDOWS) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__DJGPP__) || defined(PYOS_OS2)
+-#if defined(PYOS_OS2) && defined(PYCC_GCC)
++#if (defined(PYOS_OS2) && defined(PYCC_GCC)) || defined(__MINGW32__)
+ #define MAXPATHLEN 260
+ #define SEP '/'
+ #define ALTSEP '\\'
+@@ -20,6 +20,7 @@
+ #define MAXPATHLEN 256
+ #endif
+ #define DELIM ';'
++#define DELIMSTR ";"
+ #endif
+ #endif
+ 
+@@ -27,6 +28,7 @@
+ #define SEP '.'
+ #define MAXPATHLEN 256
+ #define DELIM ','
++#define DELIMSTR ","
+ #endif
+ 
+ 
+@@ -55,6 +57,7 @@
+ /* Search path entry delimiter */
+ #ifndef DELIM
+ #define DELIM ':'
++#define DELIMSTR ":"
+ #endif
+ 
+ #ifdef __cplusplus
+diff -urN a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in	2013-05-17 23:57:28.845355107 +0100
++++ b/Makefile.pre.in	2013-05-17 23:57:29.220359502 +0100
+@@ -84,7 +84,8 @@
+ # C flags used for building the interpreter object files
+ PY_CFLAGS=	$(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
+ 
+-
++# ; on Windows otherwise :
++DELIM=		@DELIM@
+ # Machine-dependent subdirectories
+ MACHDEP=	@MACHDEP@
+ 
+diff -urN a/Modules/getpath.c b/Modules/getpath.c
+--- a/Modules/getpath.c	2013-05-17 23:57:28.808354672 +0100
++++ b/Modules/getpath.c	2013-05-17 23:57:29.221359514 +0100
+@@ -117,7 +117,7 @@
+ #endif
+ 
+ #ifndef PYTHONPATH
+-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
++#define PYTHONPATH PREFIX "/lib/python" VERSION DELIMSTR \
+               EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
+ #endif
+ 
+diff -urN a/Modules/Setup.dist b/Modules/Setup.dist
+--- a/Modules/Setup.dist	2013-05-17 23:57:28.816354766 +0100
++++ b/Modules/Setup.dist	2013-05-17 23:57:29.221359514 +0100
+@@ -84,22 +84,22 @@
+ # Empty since this is now just the runtime prefix.
+ DESTPATH=
+ 
+-# Site specific path components -- should begin with : if non-empty
++# Site specific path components -- should begin with $(DELIM) if non-empty
+ SITEPATH=
+ 
+ # Standard path components for test modules
+ TESTPATH=
+ 
+ # Path components for machine- or system-dependent modules and shared libraries
+-MACHDEPPATH=:plat-$(MACHDEP)
++MACHDEPPATH=$(DELIM)plat-$(MACHDEP)
+ EXTRAMACHDEPPATH=
+ 
+ # Path component for the Tkinter-related modules
+ # The TKPATH variable is always enabled, to save you the effort.
+-TKPATH=:lib-tk
++TKPATH=$(DELIM)lib-tk
+ 
+ # Path component for old modules.
+-OLDPATH=:lib-old
++OLDPATH=$(DELIM)lib-old
+ 
+ COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(EXTRAMACHDEPPATH)$(TKPATH)$(OLDPATH)
+ PYTHONPATH=$(COREPYTHONPATH)
diff --git a/mingw-w64-python2/0015-mingw-use-posix-getpath.patch b/mingw-w64-python2/0015-mingw-use-posix-getpath.patch
new file mode 100644
index 0000000000..9068867840
--- /dev/null
+++ b/mingw-w64-python2/0015-mingw-use-posix-getpath.patch
@@ -0,0 +1,208 @@
+diff -urN a/configure.ac b/configure.ac
+--- a/configure.ac	2013-05-17 23:57:29.660364654 +0100
++++ b/configure.ac	2013-05-17 23:57:30.020368869 +0100
+@@ -3039,7 +3039,7 @@
+ AC_MSG_CHECKING(MACHDEP_OBJS)
+ case $host in
+   *-*-mingw*)
+-    extra_machdep_objs="PC/dl_nt.o PC/getpathp.o PC/import_nt.o"
++    extra_machdep_objs="PC/dl_nt.o Modules/getpath.o PC/import_nt.o"
+     ;;
+ esac
+ if test -z "$MACHDEP_OBJS"
+@@ -4794,7 +4794,7 @@
+     # FIXME: why windows builds don't use PC/frozen_dllmain.o ?
+     PYTHON_OBJS_FROZENMAIN=""
+     # default sys.path calculations for windows platforms
+-    MODULE_GETPATH=PC/getpathp.o
++    MODULE_GETPATH=Modules/getpath.o
+     ;;
+ esac
+ 
+diff -urN a/Modules/getpath.c b/Modules/getpath.c
+--- a/Modules/getpath.c	2013-05-17 23:57:29.609364057 +0100
++++ b/Modules/getpath.c	2013-05-17 23:57:30.021368880 +0100
+@@ -10,6 +10,10 @@
+ #include <mach-o/dyld.h>
+ #endif
+ 
++#ifdef MS_WINDOWS
++#include <windows.h>
++#endif
++
+ /* Search in some common locations for the associated Python libraries.
+  *
+  * Two directories must be found, the platform independent directory
+@@ -128,6 +132,10 @@
+ static char prefix[MAXPATHLEN+1];
+ static char exec_prefix[MAXPATHLEN+1];
+ static char progpath[MAXPATHLEN+1];
++#ifdef MS_WINDOWS
++static char dllpath[MAXPATHLEN+1];
++extern HANDLE PyWin_DLLhModule;
++#endif
+ static char *module_search_path = NULL;
+ static char lib_python[] = "lib/python" VERSION;
+ 
+@@ -208,7 +216,11 @@
+ joinpath(char *buffer, char *stuff)
+ {
+     size_t n, k;
++#ifdef MS_WINDOWS
++    if (stuff[0] == SEP || (stuff[0] != 0 && stuff[1] == L':'))
++#else
+     if (stuff[0] == SEP)
++#endif
+         n = 0;
+     else {
+         n = strlen(buffer);
+@@ -229,7 +241,11 @@
+ static void
+ copy_absolute(char *path, char *p)
+ {
++#ifdef MS_WINDOWS
++    if (p[0] == SEP || (p[0] != 0 && p[1] == ':'))
++#else
+     if (p[0] == SEP)
++#endif
+         strcpy(path, p);
+     else {
+         if (!getcwd(path, MAXPATHLEN)) {
+@@ -249,7 +265,11 @@
+ {
+     char buffer[MAXPATHLEN + 1];
+ 
++#ifdef MS_WINDOWS
++    if (path[0] == SEP || (path[0] != 0 && path[1] == ':'))
++#else
+     if (path[0] == SEP)
++#endif
+         return;
+     copy_absolute(buffer, path);
+     strcpy(path, buffer);
+@@ -382,6 +402,35 @@
+ }
+ 
+ 
++#ifdef MS_WINDOWS
++/* Calculates dllpath and progpath, replacing \\ with / */
++int GetWindowsModulePaths()
++{
++    int result = 0;
++    char* seps;
++    result = GetModuleFileNameA(NULL, progpath, MAXPATHLEN);
++    seps = strchr(progpath, '\\');
++    while(seps) {
++        *seps = '/';
++        seps = strchr(seps, '\\');
++    }
++    dllpath[0] = '\0';
++#ifdef Py_ENABLE_SHARED
++    if (PyWin_DLLhModule) {
++        if((GetModuleFileNameA(PyWin_DLLhModule, dllpath, MAXPATHLEN) > 0)) {
++            result = 1;
++            seps = strchr(dllpath, '\\');
++            while(seps) {
++                *seps = '/';
++                seps = strchr(seps, '\\');
++            }
++        }
++    }
++#endif
++    return result;
++}
++#endif /* MS_WINDOWS */
++
+ static void
+ calculate_path(void)
+ {
+@@ -433,6 +482,10 @@
+      else if(0 == _NSGetExecutablePath(progpath, &nsexeclength) && progpath[0] == SEP)
+        ;
+ #endif /* __APPLE__ */
++#ifdef MS_WINDOWS
++    else if(GetWindowsModulePaths()) {
++    }
++#endif /* MS_WINDOWS */
+         else if (path) {
+                 while (1) {
+                         char *delim = strchr(path, DELIM);
+@@ -460,7 +513,11 @@
+         }
+         else
+                 progpath[0] = '\0';
++#ifdef MS_WINDOWS
++        if (progpath[0] != '\0' && progpath[0] != SEP && progpath[1] != ':')
++#else
+         if (progpath[0] != SEP && progpath[0] != '\0')
++#endif
+                 absolutize(progpath);
+         strncpy(argv0_path, progpath, MAXPATHLEN);
+         argv0_path[MAXPATHLEN] = '\0';
+diff -urN a/Modules/posixmodule.c b/Modules/posixmodule.c
+--- a/Modules/posixmodule.c	2013-05-17 23:57:29.611364080 +0100
++++ b/Modules/posixmodule.c	2013-05-17 23:57:30.022368892 +0100
+@@ -2322,7 +2322,7 @@
+             Py_END_ALLOW_THREADS
+             /* FindNextFile sets error to ERROR_NO_MORE_FILES if
+                it got to the end of the directory. */
+-            if (!result && GetLastError() != ERROR_NO_MORE_FILES) {
++            if (!result && GetLastError() != 0 && GetLastError() != ERROR_NO_MORE_FILES) {
+                 Py_DECREF(d);
+                 win32_error_unicode("FindNextFileW", wnamebuf);
+                 FindClose(hFindFile);
+@@ -2390,7 +2390,7 @@
+         Py_END_ALLOW_THREADS
+         /* FindNextFile sets error to ERROR_NO_MORE_FILES if
+            it got to the end of the directory. */
+-        if (!result && GetLastError() != ERROR_NO_MORE_FILES) {
++        if (!result && GetLastError() != 0 && GetLastError() != ERROR_NO_MORE_FILES) {
+             Py_DECREF(d);
+             win32_error("FindNextFile", namebuf);
+             FindClose(hFindFile);
+diff -urN a/Parser/metagrammar.c b/Parser/metagrammar.c
+--- a/Parser/metagrammar.c	2013-05-17 23:57:29.622364209 +0100
++++ b/Parser/metagrammar.c	2013-05-17 23:57:30.022368892 +0100
+@@ -139,7 +139,7 @@
+     {7, 0},
+     {8, 0},
+ };
+-static grammar _PyParser_Grammar = {
++static grammar _PyParser_MetaGrammar = {
+     6,
+     dfas,
+     {19, labels},
+@@ -149,7 +149,7 @@
+ grammar *
+ meta_grammar(void)
+ {
+-    return &_PyParser_Grammar;
++    return &_PyParser_MetaGrammar;
+ }
+ 
+ grammar *
+diff -urN a/Python/pythonrun.c b/Python/pythonrun.c
+--- a/Python/pythonrun.c	2013-05-17 23:57:29.582363741 +0100
++++ b/Python/pythonrun.c	2013-05-17 23:57:30.023368903 +0100
+@@ -18,6 +18,7 @@
+ #include "eval.h"
+ #include "marshal.h"
+ #include "abstract.h"
++#include "osdefs.h"
+ 
+ #ifdef HAVE_SIGNAL_H
+ #include <signal.h>
+@@ -666,6 +667,13 @@
+ void
+ Py_SetProgramName(char *pn)
+ {
++#ifdef __MINGW32__
++    char* seps = strchr(pn, ALTSEP);
++    while(seps) {
++        *seps = SEP;
++        seps = strchr(seps, ALTSEP);
++    }
++#endif
+     if (pn && *pn)
+         progname = pn;
+ }
diff --git a/mingw-w64-python2/0020-mingw-w64-test-for-REPARSE_DATA_BUFFER.patch b/mingw-w64-python2/0020-mingw-w64-test-for-REPARSE_DATA_BUFFER.patch
new file mode 100644
index 0000000000..13e9d43bc0
--- /dev/null
+++ b/mingw-w64-python2/0020-mingw-w64-test-for-REPARSE_DATA_BUFFER.patch
@@ -0,0 +1,32 @@
+diff -urN a/configure.ac b/configure.ac
+--- a/configure.ac	2013-05-17 23:57:30.349372710 +0100
++++ b/configure.ac	2013-05-17 23:57:30.707376891 +0100
+@@ -4245,6 +4245,28 @@
+ # check for endianness
+ AC_C_BIGENDIAN
+ 
++# REPARSE_DATA_BUFFER is in winnt.h on mingw32 and (unusably) ddk/ntifs.h on mingw64.
++case $host in
++  *-*-mingw*)
++AC_CACHE_CHECK([if struct REPARSE_DATA_BUFFER is in winnt.h],
++[ac_cv_struct_reparse_data_buffer_in_winnt_h],
++  [AC_COMPILE_IFELSE(
++    [AC_LANG_PROGRAM(
++      [#include <windows.h>
++       #include <winnt.h>],
++      [REPARSE_DATA_BUFFER rdb],
++    )],
++    [ac_cv_struct_reparse_data_buffer_in_winnt_h=yes],
++    [ac_cv_struct_reparse_data_buffer_in_winnt_h=no]
++  )
++])
++if test "x${ac_cv_struct_reparse_data_buffer_in_winnt_h}" = xyes; then
++  AC_DEFINE([REPARSE_DATA_BUFFER_IN_WINNT], [], [REPARSE_DATA_BUFFER in winnt.h])
++  AC_SUBST(REPARSE_DATA_BUFFER_IN_WINNT)
++fi
++  ;;
++esac
++
+ # Check whether right shifting a negative integer extends the sign bit
+ # or fills with zeros (like the Cray J90, according to Tim Peters).
+ AC_MSG_CHECKING(whether right shift extends the sign bit)
diff --git a/mingw-w64-python2/0025-mingw-regen-with-stddef-instead.patch b/mingw-w64-python2/0025-mingw-regen-with-stddef-instead.patch
new file mode 100644
index 0000000000..e96df436e5
--- /dev/null
+++ b/mingw-w64-python2/0025-mingw-regen-with-stddef-instead.patch
@@ -0,0 +1,26 @@
+diff -urN a/Lib/plat-generic/regen b/Lib/plat-generic/regen
+--- a/Lib/plat-generic/regen	2013-05-17 23:57:31.156382129 +0100
++++ b/Lib/plat-generic/regen	2013-05-17 23:57:31.455385611 +0100
+@@ -1,3 +1,9 @@
+ #! /bin/sh
+ set -v
+-eval $PYTHON_FOR_BUILD ../../Tools/scripts/h2py.py -i "'(u_long)'" /usr/include/netinet/in.h
++if [ -n "$1" ]; then
++    CCINSTALL=$($1 -print-search-dirs | head -1 | cut -d' ' -f2)
++    REGENHEADER=${CCINSTALL//\\//}include/stddef.h
++else
++    REGENHEADER=/usr/include/netinet/in.h
++fi
++eval $PYTHON_FOR_BUILD ../../Tools/scripts/h2py.py -i "'(u_long)'" $REGENHEADER
+diff -urN a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in	2013-05-17 23:57:31.045380836 +0100
++++ b/Makefile.pre.in	2013-05-17 23:57:31.456385623 +0100
+@@ -1044,7 +1044,7 @@
+ 	else \
+ 	  PYTHON_FOR_BUILD="$(PYTHON_FOR_BUILD)"; \
+ 	fi; \
+-	cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
++	cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen "$(CC)"
+ 
+ python-config: $(srcdir)/Misc/python-config.in
+ 	# Substitution happens here, as the completely-expanded BINDIR
diff --git a/mingw-w64-python2/0030-mingw-add-libraries-for-_msi.patch b/mingw-w64-python2/0030-mingw-add-libraries-for-_msi.patch
new file mode 100644
index 0000000000..f3d442432b
--- /dev/null
+++ b/mingw-w64-python2/0030-mingw-add-libraries-for-_msi.patch
@@ -0,0 +1,13 @@
+diff -urN a/setup.py b/setup.py
+--- a/setup.py	2013-05-17 23:57:31.755389105 +0100
++++ b/setup.py	2013-05-17 23:57:32.128393445 +0100
+@@ -959,7 +959,8 @@
+                 for p in ['msvcrtmodule.c']]) )
+ 
+             exts.append( Extension('_msi', [os.path.join(pc_srcdir, p)
+-                for p in ['_msi.c']]) )
++                for p in ['_msi.c']],
++                libraries=['msi','cabinet','rpcrt4']) ) # To link with lib(msi|cabinet|rpcrt4).a
+ 
+             exts.append( Extension('_subprocess', [os.path.join(pc_srcdir, p)
+                 for p in ['_subprocess.c']]) )
diff --git a/mingw-w64-python2/0035-MSYS-add-MSYSVPATH-AC_ARG.patch b/mingw-w64-python2/0035-MSYS-add-MSYSVPATH-AC_ARG.patch
new file mode 100644
index 0000000000..c81ae79da2
--- /dev/null
+++ b/mingw-w64-python2/0035-MSYS-add-MSYSVPATH-AC_ARG.patch
@@ -0,0 +1,41 @@
+diff -urN a/configure.ac b/configure.ac
+--- a/configure.ac	2013-05-17 23:57:32.440397068 +0100
++++ b/configure.ac	2013-05-17 23:57:32.805401308 +0100
+@@ -503,6 +503,17 @@
+ AC_MSG_RESULT([$DELIM])
+ AC_SUBST(DELIM)
+ 
++# MSYS make uses a 'virtual' VPATH, but getpath.c uses
++# GetModuleFileNameW (replacing \ with /). This allows the user to
++# define the 'actual 'real' value. Note, it should contain / not \,
++# (/ is returned by "pwd -W")
++AC_ARG_VAR(MSYSVPATH,
++           For MSYS, allows specifying the real VPATH. Use / not \)
++if test -z "$MSYSVPATH"; then
++    MSYSVPATH=$srcdir
++fi
++AC_SUBST(MSYSVPATH)
++
+ AC_MSG_CHECKING([for init system calls])
+ AC_SUBST(INITSYS)
+ case $host in
+diff -urN a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in	2013-05-17 23:57:32.427396917 +0100
++++ b/Makefile.pre.in	2013-05-17 23:57:32.807401331 +0100
+@@ -27,6 +27,7 @@
+ VERSION=	@VERSION@
+ srcdir=		@srcdir@
+ VPATH=		@srcdir@
++MSYSVPATH=	@MSYSVPATH@
+ abs_srcdir=	@abs_srcdir@
+ abs_builddir=	@abs_builddir@
+ build=		@build@
+@@ -580,7 +581,7 @@
+ 		-DPREFIX='"$(prefix)"' \
+ 		-DEXEC_PREFIX='"$(exec_prefix)"' \
+ 		-DVERSION='"$(VERSION)"' \
+-		-DVPATH='"$(VPATH)"' \
++		-DVPATH='"$(MSYSVPATH)"' \
+ 		-o $@ $(srcdir)/Modules/getpath.c
+ 
+ # default sys.path calculations for windows platforms
diff --git a/mingw-w64-python2/0040-mingw-cygwinccompiler-use-CC-envvars-and-ld-from-print-prog-name.patch b/mingw-w64-python2/0040-mingw-cygwinccompiler-use-CC-envvars-and-ld-from-print-prog-name.patch
new file mode 100644
index 0000000000..120970e363
--- /dev/null
+++ b/mingw-w64-python2/0040-mingw-cygwinccompiler-use-CC-envvars-and-ld-from-print-prog-name.patch
@@ -0,0 +1,47 @@
+diff -urN a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py
+--- a/Lib/distutils/cygwinccompiler.py	2013-05-17 23:57:33.208405982 +0100
++++ b/Lib/distutils/cygwinccompiler.py	2013-05-17 23:57:33.479409122 +0100
+@@ -442,7 +442,8 @@
+     from distutils.spawn import find_executable
+     import re
+ 
+-    gcc_exe = find_executable('gcc')
++    gcc_exe = os.environ.get('CC') or find_executable('gcc')
++    ld_exe = os.environ.get('LD') or find_executable('ld')
+     if gcc_exe:
+         out = os.popen(gcc_exe + ' -dumpversion','r')
+         out_string = out.read()
+@@ -452,9 +453,11 @@
+             gcc_version = LooseVersion(result.group(1))
+         else:
+             gcc_version = None
++        out = os.popen(gcc_exe + ' --print-prog-name ld','r')
++        ld_exe = out.read().decode('ascii').split()[0]
++        out.close()
+     else:
+         gcc_version = None
+-    ld_exe = find_executable('ld')
+     if ld_exe:
+         out = os.popen(ld_exe + ' -v','r')
+         out_string = out.read()
+@@ -466,7 +469,7 @@
+             ld_version = None
+     else:
+         ld_version = None
+-    dllwrap_exe = find_executable('dllwrap')
++    dllwrap_exe = os.environ.get('DLLWRAP') or find_executable('dllwrap')
+     if dllwrap_exe:
+         out = os.popen(dllwrap_exe + ' --version','r')
+         out_string = out.read()
+diff -urN a/Modules/Setup.config.in b/Modules/Setup.config.in
+--- a/Modules/Setup.config.in	2013-05-17 23:57:33.073404419 +0100
++++ b/Modules/Setup.config.in	2013-05-17 23:57:33.480409133 +0100
+@@ -18,6 +18,8 @@
+ @BUILDIN_WIN32_MODULE@operator operator.c	# operator.add() and similar goodies
+ @BUILDIN_WIN32_MODULE@_locale _localemodule.c	# -lintl
+ @BUILDIN_WIN32_MODULE@_winreg ../PC/_winreg.c
++@BUILDIN_WIN32_MODULE@time timemodule.c
++@BUILDIN_WIN32_MODULE@msvcrt ../PC/msvcrtmodule.c
+ 
+ 
+ # The rest of the modules previously listed in this file are built
diff --git a/mingw-w64-python2/0045-cross-darwin.patch b/mingw-w64-python2/0045-cross-darwin.patch
new file mode 100644
index 0000000000..c57ed9b647
--- /dev/null
+++ b/mingw-w64-python2/0045-cross-darwin.patch
@@ -0,0 +1,118 @@
+diff -urN a/configure.ac b/configure.ac
+--- a/configure.ac	2013-05-17 23:57:33.791412736 +0100
++++ b/configure.ac	2013-05-17 23:57:34.157416971 +0100
+@@ -312,6 +312,10 @@
+        # `define_xopen_source' in the case statement below. For the
+        # current supported cross builds, this macro is not adjusted.
+ 	case "$host" in
++	*-*-darwin*)
++		ac_sys_system=Darwin
++		ac_sys_version=11
++		;;
+ 	*-*-linux*)
+ 		ac_sys_system=Linux
+ 		;;
+@@ -368,6 +372,9 @@
+ 	*-*-cygwin*|*-*-mingw*)
+ 		_host_cpu=
+ 		;;
++	*-*-darwin*)
++		_host_cpu=
++		;;
+ 	*)
+ 		# for now, limit cross builds to known configurations
+ 		MACHDEP="unknown"
+@@ -1171,6 +1178,16 @@
+ UNIVERSAL_ARCH_FLAGS=
+ AC_SUBST(UNIVERSAL_ARCH_FLAGS)
+ 
++if test "x$cross_compiling" = xyes; then
++    function arch
++    {
++        echo i386
++    }
++    OSX_ARCH_PROG=arch
++else
++    OSX_ARCH_PROG=/usr/bin/arch
++fi
++
+ # tweak BASECFLAGS based on compiler and platform
+ case $GCC in
+ yes)
+@@ -1227,7 +1244,7 @@
+ 	    # Calculate the right deployment target for this build.
+ 	    #
+ 	    cur_target=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'`
+-	    if test ${cur_target} '>' 10.2; then
++	    if test ${cur_target} > 10.2; then
+ 		    cur_target=10.3
+ 		    if test ${enable_universalsdk}; then
+ 			    if test "${UNIVERSAL_ARCHS}" = "all"; then
+@@ -1247,7 +1264,7 @@
+ 				    cur_target='10.5'
+ 			    fi
+ 		    else
+-			    if test `/usr/bin/arch` = "i386"; then
++			    if test "$($OSX_ARCH_PROG)" = "i386"; then
+ 				    # On Intel macs default to a deployment
+ 				    # target of 10.4, that's the first OSX
+ 				    # release with Intel support.
+@@ -1912,7 +1929,7 @@
+     if test "${enable_universalsdk}"; then
+ 	    :
+     else
+-        LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `/usr/bin/arch`"
++        LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only $($OSX_ARCH_PROG)"
+     fi
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+@@ -1937,7 +1954,7 @@
+     ]])],[ac_osx_32bit=yes],[ac_osx_32bit=no],[ac_osx_32bit=yes])
+     
+     if test "${ac_osx_32bit}" = "yes"; then
+-    	case `/usr/bin/arch` in
++    	case $($OSX_ARCH_PROG) in
+     	i386) 
+     		MACOSX_DEFAULT_ARCH="i386" 
+     		;;
+@@ -1949,7 +1966,7 @@
+     		;;
+     	esac
+     else
+-    	case `/usr/bin/arch` in
++    	case $($OSX_ARCH_PROG) in
+     	i386) 
+     		MACOSX_DEFAULT_ARCH="x86_64" 
+     		;;
+@@ -1988,8 +2005,8 @@
+ fi
+ 
+ AC_MSG_CHECKING(for dyld)
+-case $ac_sys_system/$ac_sys_release in
+-  Darwin/*)
++case $host in
++  *darwin*)
+   	AC_DEFINE(WITH_DYLD, 1, 
+         [Define if you want to use the new-style (Openstep, Rhapsody, MacOS)
+          dynamic linker (dyld) instead of the old-style (NextStep) dynamic
+@@ -2113,7 +2130,7 @@
+ 		# Use -undefined dynamic_lookup whenever possible (10.3 and later).
+ 		# This allows an extension to be used in any Python
+ 
+-		if test ${MACOSX_DEPLOYMENT_TARGET} '>' 10.2
++		if test ${MACOSX_DEPLOYMENT_TARGET} > 10.2
+ 		then
+ 			if test "${enable_universalsdk}"; then
+ 				LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
+diff -urN a/Modules/parsermodule.c b/Modules/parsermodule.c
+--- a/Modules/parsermodule.c	2013-05-17 23:57:33.742412168 +0100
++++ b/Modules/parsermodule.c	2013-05-17 23:57:34.160417006 +0100
+@@ -39,7 +39,7 @@
+ #include "ast.h"
+ #include "pyarena.h"
+ 
+-extern grammar _PyParser_Grammar; /* From graminit.c */
++PyAPI_DATA(grammar) _PyParser_Grammar; /* From graminit.c */
+ 
+ #ifdef lint
+ #include <note.h>
diff --git a/mingw-w64-python2/0050-mingw-sysconfig-like-posix.patch b/mingw-w64-python2/0050-mingw-sysconfig-like-posix.patch
new file mode 100644
index 0000000000..0f5842cd42
--- /dev/null
+++ b/mingw-w64-python2/0050-mingw-sysconfig-like-posix.patch
@@ -0,0 +1,55 @@
+diff -urN a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
+--- a/Lib/distutils/sysconfig.py	2013-05-17 23:57:34.569421731 +0100
++++ b/Lib/distutils/sysconfig.py	2013-05-17 23:57:34.849424966 +0100
+@@ -120,7 +120,7 @@
+     if prefix is None:
+         prefix = plat_specific and EXEC_PREFIX or PREFIX
+ 
+-    if os.name == "posix":
++    if os.name == "posix" or sys.version.find('GCC') >= 0:
+         libpython = os.path.join(prefix,
+                                  "lib", "python" + get_python_version())
+         if standard_lib:
+diff -urN a/Lib/sysconfig.py b/Lib/sysconfig.py
+--- a/Lib/sysconfig.py	2013-05-17 23:57:34.569421731 +0100
++++ b/Lib/sysconfig.py	2013-05-17 23:57:34.850424978 +0100
+@@ -27,13 +27,13 @@
+         'data'   : '{base}',
+         },
+     'nt': {
+-        'stdlib': '{base}/Lib',
+-        'platstdlib': '{base}/Lib',
+-        'purelib': '{base}/Lib/site-packages',
+-        'platlib': '{base}/Lib/site-packages',
+-        'include': '{base}/Include',
+-        'platinclude': '{base}/Include',
+-        'scripts': '{base}/Scripts',
++        'stdlib': '{base}/lib/python{py_version_short}',
++        'platstdlib': '{base}/lib/python{py_version_short}',
++        'purelib': '{base}/lib/python{py_version_short}',
++        'platlib': '{base}/lib/python{py_version_short}',
++        'include': '{base}/include/python{py_version_short}',
++        'platinclude': '{base}/include/python{py_version_short}',
++        'scripts': '{base}/bin',
+         'data'   : '{base}',
+         },
+     'os2': {
+@@ -56,12 +56,12 @@
+         'data'   : '{userbase}',
+         },
+     'nt_user': {
+-        'stdlib': '{userbase}/Python{py_version_nodot}',
+-        'platstdlib': '{userbase}/Python{py_version_nodot}',
+-        'purelib': '{userbase}/Python{py_version_nodot}/site-packages',
+-        'platlib': '{userbase}/Python{py_version_nodot}/site-packages',
+-        'include': '{userbase}/Python{py_version_nodot}/Include',
+-        'scripts': '{userbase}/Scripts',
++        'stdlib': '{userbase}/lib/python{py_version_short}',
++        'platstdlib': '{userbase}/lib/python{py_version_short}',
++        'purelib': '{userbase}/lib/python{py_version_short}',
++        'platlib': '{userbase}/lib/python{py_version_short}',
++        'include': '{userbase}/include/python{py_version_short}',
++        'scripts': '{userbase}/bin',
+         'data'   : '{userbase}',
+         },
+     'posix_user': {
diff --git a/mingw-w64-python2/0055-mingw-pdcurses_ISPAD.patch b/mingw-w64-python2/0055-mingw-pdcurses_ISPAD.patch
new file mode 100644
index 0000000000..70541f4fa0
--- /dev/null
+++ b/mingw-w64-python2/0055-mingw-pdcurses_ISPAD.patch
@@ -0,0 +1,14 @@
+diff -urN a/Include/py_curses.h b/Include/py_curses.h
+--- a/Include/py_curses.h	2013-05-17 23:57:35.185428843 +0100
++++ b/Include/py_curses.h	2013-05-17 23:57:35.549433037 +0100
+@@ -54,6 +54,10 @@
+ #endif
+ #endif
+ 
++#if defined(__MINGW32__) && !defined(_ISPAD)
++#define _ISPAD 0x10
++#endif
++
+ #ifdef HAVE_NCURSES_H
+ /* configure was checking <curses.h>, but we will
+    use <ncurses.h>, which has all these features. */
diff --git a/mingw-w64-python2/0060-mingw-static-tcltk.patch b/mingw-w64-python2/0060-mingw-static-tcltk.patch
new file mode 100644
index 0000000000..519603bd31
--- /dev/null
+++ b/mingw-w64-python2/0060-mingw-static-tcltk.patch
@@ -0,0 +1,73 @@
+diff -urN a/setup.py b/setup.py
+--- a/setup.py	2013-05-17 23:57:35.846436460 +0100
++++ b/setup.py	2013-05-17 23:57:36.259441211 +0100
+@@ -563,7 +563,7 @@
+         if host_platform == 'hp-ux11':
+             lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32']
+ 
+-        if host_platform == 'darwin':
++        if host_platform in ['darwin', 'mingw', 'win32']:
+             # This should work on any unixy platform ;-)
+             # If the user has bothered specifying additional -I and -L flags
+             # in OPT and LDFLAGS we might as well use them here.
+@@ -573,6 +573,8 @@
+             # FIXME: Why LDFLAGS again ?
+             cflags, ldflags = sysconfig.get_config_vars(
+                     'CFLAGS', 'LDFLAGS')
++            cflags = cflags + ' ' + ('',os.environ.get('CC'))[os.environ.get('CC') != None]
++            ldflags = ldflags + ' ' + ('',os.environ.get('LDSHARED'))[os.environ.get('LDSHARED') != None]
+             for item in cflags.split():
+                 if item.startswith('-I'):
+                     inc_dirs.append(item[2:])
+@@ -1916,14 +1918,19 @@
+         # The versions with dots are used on Unix, and the versions without
+         # dots on Windows, for detection by cygwin.
+         tcllib = tklib = tcl_includes = tk_includes = None
+-        for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
+-                        '8.2', '82', '8.1', '81', '8.0', '80']:
+-            tklib = self.compiler.find_library_file(lib_dirs,
+-                                                        'tk' + version)
+-            tcllib = self.compiler.find_library_file(lib_dirs,
+-                                                         'tcl' + version)
+-            if tklib and tcllib:
+-                # Exit the loop when we've found the Tcl/Tk libraries
++        tcltk_suffix = None
++        for suffix in ['', 's']:
++            for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
++                            '8.2', '82', '8.1', '81', '8.0', '80', '']:
++                tklib = self.compiler.find_library_file(lib_dirs,
++                                                            'tk' + version + suffix)
++                tcllib = self.compiler.find_library_file(lib_dirs,
++                                                             'tcl' + version + suffix)
++                if tklib and tcllib:
++                    # Exit the loop when we've found the Tcl/Tk libraries
++                    tcltk_suffix = suffix
++                    break
++            if tcltk_suffix != None:
+                 break
+ 
+         # Now check for the header files
+@@ -1992,15 +1999,21 @@
+             libs.append('BLT')
+ 
+         # Add the Tcl/Tk libraries
+-        libs.append('tk'+ version)
+-        libs.append('tcl'+ version)
++        libs.append('tk'+ version + tcltk_suffix)
++        libs.append('tcl'+ version + tcltk_suffix)
++        if host_platform == 'win32':
++            for winlib in ['ws2_32','gdi32','comctl32','comdlg32','imm32','uuid','oleaut32','ole32']:
++                libs.append( winlib )
+ 
+         if host_platform in ['aix3', 'aix4']:
+             libs.append('ld')
+ 
+         # Finally, link with the X11 libraries (not appropriate on cygwin, mingw)
++        # ...on those platforms, define STATIC_BUILD if linking to static tcl/tk.
+         if not host_platform in ['cygwin', 'mingw', 'win32']:
+             libs.append('X11')
++        elif tcllib.endswith('s.a'):
++            defs.append( ('STATIC_BUILD',1) )
+ 
+         ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
+                         define_macros=[('WITH_APPINIT', 1)] + defs,
diff --git a/mingw-w64-python2/0065-mingw-x86_64-size_t-format-specifier-pid_t.patch b/mingw-w64-python2/0065-mingw-x86_64-size_t-format-specifier-pid_t.patch
new file mode 100644
index 0000000000..9005e18cef
--- /dev/null
+++ b/mingw-w64-python2/0065-mingw-x86_64-size_t-format-specifier-pid_t.patch
@@ -0,0 +1,24 @@
+diff -urN a/Include/pyport.h b/Include/pyport.h
+--- a/Include/pyport.h	2013-05-17 23:57:36.579444889 +0100
++++ b/Include/pyport.h	2013-05-17 23:57:36.946449107 +0100
+@@ -203,9 +203,11 @@
+ /* Smallest negative value of type Py_ssize_t. */
+ #define PY_SSIZE_T_MIN (-PY_SSIZE_T_MAX-1)
+ 
++/*
+ #if SIZEOF_PID_T > SIZEOF_LONG
+ #   error "Python doesn't support sizeof(pid_t) > sizeof(long)"
+ #endif
++*/
+ 
+ /* PY_FORMAT_SIZE_T is a platform-specific modifier for use in a printf
+  * format to convert an argument with the width of a size_t or Py_ssize_t.
+@@ -237,6 +239,8 @@
+ #       define PY_FORMAT_SIZE_T "l"
+ #   elif defined(MS_WINDOWS)
+ #       define PY_FORMAT_SIZE_T "I"
++#   elif defined(__MINGW32__) && defined(__USE_MINGW_ANSI_STDIO)
++#       define PY_FORMAT_SIZE_T "z"
+ #   else
+ #       error "This platform's pyconfig.h needs to define PY_FORMAT_SIZE_T"
+ #   endif
diff --git a/mingw-w64-python2/0070-python-disable-dbm.patch b/mingw-w64-python2/0070-python-disable-dbm.patch
new file mode 100644
index 0000000000..242fbd7c47
--- /dev/null
+++ b/mingw-w64-python2/0070-python-disable-dbm.patch
@@ -0,0 +1,12 @@
+diff -urN a/setup.py b/setup.py
+--- a/setup.py	2013-05-17 23:57:37.265452766 +0100
++++ b/setup.py	2013-05-17 23:57:37.638457042 +0100
+@@ -1324,7 +1324,7 @@
+ 
+         dbm_order = ['gdbm']
+         # The standard Unix dbm module:
+-        if host_platform not in ['cygwin']:
++        if host_platform not in ['cygwin', 'mingw', 'win32']:
+             config_args = [arg.strip("'")
+                            for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
+             dbm_args = [arg for arg in config_args
diff --git a/mingw-w64-python2/0075-add-python-config-sh.patch b/mingw-w64-python2/0075-add-python-config-sh.patch
new file mode 100644
index 0000000000..54464420d7
--- /dev/null
+++ b/mingw-w64-python2/0075-add-python-config-sh.patch
@@ -0,0 +1,172 @@
+diff -urN a/configure.ac b/configure.ac
+--- a/configure.ac	2013-05-17 23:57:37.951460630 +0100
++++ b/configure.ac	2013-05-17 23:57:38.317464817 +0100
+@@ -913,6 +913,7 @@
+ 
+ # Other platforms follow
+ if test $enable_shared = "yes"; then
++  PY_ENABLE_SHARED=1
+   AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.])
+   case $ac_sys_system in
+     BeOS*)
+@@ -981,6 +982,7 @@
+           ;;
+   esac
+ else # shared is disabled
++  PY_ENABLE_SHARED=0
+   case $ac_sys_system in
+     CYGWIN*)
+           BLDLIBRARY='$(LIBRARY)'
+@@ -992,6 +994,7 @@
+           LDLIBRARY='libpython$(VERSION).a';;
+   esac
+ fi
++AC_SUBST(PY_ENABLE_SHARED)
+ 
+ if test "$cross_compiling" = yes; then
+ 	RUNSHARED=
+@@ -4862,7 +4865,7 @@
+ AC_MSG_RESULT(done)
+ 
+ # generate output files
+-AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc)
++AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-config.sh)
+ AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
+ AC_OUTPUT
+ 
+diff -urN a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in	2013-05-17 23:57:37.937460470 +0100
++++ b/Makefile.pre.in	2013-05-17 23:57:38.319464839 +0100
+@@ -1051,6 +1051,8 @@
+ 	# Substitution happens here, as the completely-expanded BINDIR
+ 	# is not available in configure
+ 	sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
++	# Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR}
++	sed -e "s,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g" < Misc/python-config.sh >python-config.sh
+ 
+ # Install the include files
+ INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
+@@ -1109,6 +1111,7 @@
+ 	$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
+ 	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
+ 	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
++	$(INSTALL_SCRIPT) python-config.sh $(DESTDIR)$(BINDIR)/python-config.sh
+ 	rm python-config
+ 	@if [ -s Modules/python.exp -a \
+ 		"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
+diff -urN a/Misc/python-config.sh.in b/Misc/python-config.sh.in
+--- a/Misc/python-config.sh.in	1970-01-01 01:00:00.000000000 +0100
++++ b/Misc/python-config.sh.in	2013-05-17 23:57:38.320464851 +0100
+@@ -0,0 +1,112 @@
++#!/usr/bin/env sh
++
++exit_with_usage ()
++{
++    echo "Usage: $0 [ignored.py] --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--abiflags|--configdir"
++    exit 1
++}
++
++case "$1" in
++    *.py)
++        shift
++    ;;
++esac
++
++if [ "$1" = "" ] ; then
++    exit_with_usage
++fi
++
++# Returns the actual prefix where this script was installed to.
++installed_prefix ()
++{
++    local RESULT=$(dirname $(cd $(dirname "$1") && pwd -P))
++    local READLINK=readlink
++    if [ "$(uname -s)" = "Darwin" ] ; then
++        # readlink in darwin can't handle -f.  Use greadlink from MacPorts instead.
++        READLINK=greadlink
++    fi
++    if [ $(which $READLINK) ] ; then
++        RESULT=$($READLINK -f "$RESULT")
++    fi
++    echo $RESULT
++}
++
++prefix_build="@prefix@"
++prefix_real=$(installed_prefix "$0")
++
++# Use sed to fix paths from their built to locations to their installed to locations.
++prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#")
++exec_prefix_build="@exec_prefix@"
++exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#")
++includedir=$(echo "@includedir@" | sed "s#$prefix_build#$prefix_real#")
++libdir=$(echo "@libdir@" | sed "s#$prefix_build#$prefix_real#")
++CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix_build#$prefix_real#")
++VERSION="@VERSION@"
++LIBM="@LIBM@"
++LIBC="@LIBC@"
++SYSLIBS="$LIBM $LIBC"
++ABIFLAGS="@ABIFLAGS@"
++# Protect against lack of substitution.
++if [ "$ABIFLAGS" = "@ABIFLAGS@" ] ; then
++    ABIFLAGS=
++fi
++LIBS="@LIBS@ $SYSLIBS -lpython${VERSION}${ABIFLAGS}"
++BASECFLAGS="@BASECFLAGS@"
++LDLIBRARY="@LDLIBRARY@"
++LINKFORSHARED="@LINKFORSHARED@"
++OPT="@OPT@"
++PY_ENABLE_SHARED="@PY_ENABLE_SHARED@"
++DLLLIBRARY="@DLLLIBRARY@"
++LIBDEST=${prefix}/lib/python${VERSION}
++LIBPL=${LIBDEST}/config
++SO="@SO@"
++PYTHONFRAMEWORK="@PYTHONFRAMEWORK@"
++INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}"
++PLATINCDIR="-I$includedir/python${VERSION}${ABIFLAGS}"
++
++# Scan for --help or unknown argument.
++for ARG in $*
++do
++    case $ARG in
++        --help)
++            exit_with_usage
++        ;;
++        --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags)
++        ;;
++        *)
++            exit_with_usage
++        ;;
++    esac
++done
++
++for ARG in $*
++do
++    case $ARG in
++        --prefix)
++            echo "$prefix"
++        ;;
++        --exec-prefix)
++            echo "$exec_prefix"
++        ;;
++        --includes)
++            echo "$INCDIR"
++        ;;
++        --cflags)
++            echo "$INCDIR $BASECFLAGS $CFLAGS $OPT"
++        ;;
++        --libs)
++            echo "$LIBS"
++        ;;
++        --ldflags)
++            LINKFORSHAREDUSED=
++            if [ -z "$PYTHONFRAMEWORK" ] ; then
++                LINKFORSHAREDUSED=$LINKFORSHARED
++            fi
++            LIBPLUSED=
++            if [ "$PY_ENABLE_SHARED" = "0" -o -n "$(DLLLIBRARY)" ] ; then
++                LIBPLUSED="-L$LIBPL"
++            fi
++            echo "$LIBPLUSED -L$libdir $LIBS $LINKFORSHAREDUSED"
++        ;;
++esac
++done
diff --git a/mingw-w64-python2/0080-mingw-nt-threads-vs-pthreads.patch b/mingw-w64-python2/0080-mingw-nt-threads-vs-pthreads.patch
new file mode 100644
index 0000000000..da426f87d1
--- /dev/null
+++ b/mingw-w64-python2/0080-mingw-nt-threads-vs-pthreads.patch
@@ -0,0 +1,95 @@
+diff -urN a/configure.ac b/configure.ac
+--- a/configure.ac	2013-05-17 23:57:38.648468601 +0100
++++ b/configure.ac	2013-05-17 23:57:39.049473185 +0100
+@@ -1444,6 +1444,16 @@
+   CFLAGS=$save_CFLAGS
+ fi
+ 
++AC_MSG_CHECKING(for NT threads)
++AC_CACHE_VAL(ac_cv_ntthread,
++[AC_LINK_IFELSE([
++	AC_LANG_PROGRAM([], [_beginthread(0, 0, 0);])],
++ac_cv_ntthread=yes,
++ac_cv_ntthread=no)])
++AC_MSG_RESULT([$ac_cv_ntthread])
++
++if test $ac_cv_ntthread  = no
++then
+ # On some compilers, pthreads are available without further options
+ # (e.g. MacOS X). On some of these systems, the compiler will not
+ # complain if unaccepted options are passed (e.g. gcc on Mac OS X).
+@@ -1561,19 +1571,6 @@
+ CC="$ac_save_cc"])
+ AC_MSG_RESULT($ac_cv_pthread)
+ fi
+-
+-if test "x$ac_cv_kpthread" = xno && \
+-   test "x$ac_cv_kthread" = xno && \
+-   test "x$ac_cv_pthread" = xno && \
+-   test "x$ac_cv_pthread_is_default" = xno
+-then
+-	AC_MSG_CHECKING(for NT threads)
+-	AC_CACHE_VAL(ac_cv_ntthread,
+-	[AC_LINK_IFELSE([
+-		AC_LANG_PROGRAM([], [_beginthread(0, 0, 0);])],
+-	ac_cv_ntthread=yes,
+-	ac_cv_ntthread=no)])
+-	AC_MSG_RESULT([$ac_cv_ntthread])
+ fi
+ 
+ # If we have set a CC compiler flag for thread support then
+@@ -1631,8 +1628,8 @@
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(asm/types.h conio.h curses.h direct.h dlfcn.h errno.h \
+ fcntl.h grp.h \
+-ieeefp.h io.h langinfo.h libintl.h ncurses.h poll.h process.h pthread.h \
+-shadow.h signal.h stdint.h stropts.h termios.h thread.h \
++ieeefp.h io.h langinfo.h libintl.h ncurses.h poll.h process.h \
++shadow.h signal.h stdint.h stropts.h termios.h \
+ unistd.h utime.h \
+ sys/audioio.h sys/bsdtty.h sys/epoll.h sys/event.h sys/file.h sys/loadavg.h \
+ sys/lock.h sys/mkdev.h sys/modem.h \
+@@ -1644,6 +1641,14 @@
+ AC_HEADER_DIRENT
+ AC_HEADER_MAJOR
+ 
++# If using nt threads, don't look for pthread.h or thread.h
++if test "x$ac_cv_ntthread" = xno ; then
++AC_HEADER_STDC
++AC_CHECK_HEADERS(pthread.h thread.h)
++AC_HEADER_DIRENT
++AC_HEADER_MAJOR
++fi
++
+ # On Solaris, term.h requires curses.h
+ AC_CHECK_HEADERS(term.h,,,[
+ #ifdef HAVE_CURSES_H
+@@ -2366,9 +2371,11 @@
+ 
+ # only check for sem_init if thread support is requested
+ if test "$with_threads" = "yes" -o -z "$with_threads"; then
+-    AC_SEARCH_LIBS(sem_init, pthread rt posix4) # 'Real Time' functions on Solaris
+-						# posix4 on Solaris 2.6
+-						# pthread (first!) on Linux
++	if test "$ac_cv_ntthread" = "no" -o -z "$ac_cv_ntthread"; then
++		AC_SEARCH_LIBS(sem_init, pthread rt posix4) # 'Real Time' functions on Solaris
++							# posix4 on Solaris 2.6
++							# pthread (first!) on Linux
++	fi
+ fi
+ 
+ # check if we need libintl for locale functions
+diff -urN a/Python/thread.c b/Python/thread.c
+--- a/Python/thread.c	2013-05-17 23:57:38.570467709 +0100
++++ b/Python/thread.c	2013-05-17 23:57:39.050473196 +0100
+@@ -15,7 +15,9 @@
+   __MINGW32__ to prevent case when in GCC 3.4.5 build
+   envirionment is installed posix thread package.
+  */
+-# undef HAVE_PTHREAD_H
++# ifndef HAVE_PTHREAD_H
++#  undef _POSIX_THREADS
++# endif
+ #endif
+ 
+ #ifndef _POSIX_THREADS
diff --git a/mingw-w64-python2/0085-cross-dont-add-multiarch-paths-if.patch b/mingw-w64-python2/0085-cross-dont-add-multiarch-paths-if.patch
new file mode 100644
index 0000000000..05f5e62015
--- /dev/null
+++ b/mingw-w64-python2/0085-cross-dont-add-multiarch-paths-if.patch
@@ -0,0 +1,21 @@
+diff -urN a/setup.py b/setup.py
+--- a/setup.py	2013-05-17 23:57:39.355476675 +0100
++++ b/setup.py	2013-05-17 23:57:39.736481020 +0100
+@@ -467,11 +467,13 @@
+             os.unlink(tmpfile)
+ 
+     def detect_modules(self):
+-        # Ensure that /usr/local is always used
+-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+-        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
++        if not cross_compiling:
++            # Ensure that /usr/local is always used
++            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
++            add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+         self.add_gcc_paths()
+-        self.add_multiarch_paths()
++        if not cross_compiling:
++            self.add_multiarch_paths()
+ 
+         # Add paths specified in the environment variables LDFLAGS and
+         # CPPFLAGS for header and library files.
diff --git a/mingw-w64-python2/0090-mingw-reorder-bininstall-ln-symlink-creation.patch b/mingw-w64-python2/0090-mingw-reorder-bininstall-ln-symlink-creation.patch
new file mode 100644
index 0000000000..0aeab59572
--- /dev/null
+++ b/mingw-w64-python2/0090-mingw-reorder-bininstall-ln-symlink-creation.patch
@@ -0,0 +1,14 @@
+diff -urN a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in	2013-05-17 23:57:40.046484554 +0100
++++ b/Makefile.pre.in	2013-05-17 23:57:40.455489207 +0100
+@@ -857,9 +857,9 @@
+ 	then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
+ 	else true; \
+ 	fi
+-	(cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(EXE) $(PYTHON))
+ 	-rm -f $(DESTDIR)$(BINDIR)/python2$(EXE)
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python2$(EXE))
++	(cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(EXE) $(PYTHON))
+ 	-rm -f $(DESTDIR)$(BINDIR)/python2-config
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python2-config)
+ 	-rm -f $(DESTDIR)$(BINDIR)/python-config
diff --git a/mingw-w64-python2/0095-mingw-use-backslashes-in-compileall-py.patch b/mingw-w64-python2/0095-mingw-use-backslashes-in-compileall-py.patch
new file mode 100644
index 0000000000..43e4acf3d5
--- /dev/null
+++ b/mingw-w64-python2/0095-mingw-use-backslashes-in-compileall-py.patch
@@ -0,0 +1,12 @@
+diff -urN a/Lib/compileall.py b/Lib/compileall.py
+--- a/Lib/compileall.py	2013-05-17 23:57:40.885494099 +0100
++++ b/Lib/compileall.py	2013-05-17 23:57:41.158497200 +0100
+@@ -42,6 +42,8 @@
+     success = 1
+     for name in names:
+         fullname = os.path.join(dir, name)
++        if sys.platform == "win32" and sys.version.find("GCC") >= 0:
++            fullname = fullname.replace('\\','/')
+         if ddir is not None:
+             dfile = os.path.join(ddir, name)
+         else:
diff --git a/mingw-w64-python2/0100-mingw-distutils-MSYS-convert_path-fix-and-root-hack.patch b/mingw-w64-python2/0100-mingw-distutils-MSYS-convert_path-fix-and-root-hack.patch
new file mode 100644
index 0000000000..24cb5d0d28
--- /dev/null
+++ b/mingw-w64-python2/0100-mingw-distutils-MSYS-convert_path-fix-and-root-hack.patch
@@ -0,0 +1,84 @@
+diff -urN a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
+--- a/Lib/distutils/command/install.py	2013-06-26 22:19:35.487603398 +0100
++++ b/Lib/distutils/command/install.py	2013-06-26 22:24:15.000000000 +0100
+@@ -348,7 +348,8 @@
+ 
+         # Convert directories from Unix /-separated syntax to the local
+         # convention.
+-        self.convert_paths('lib', 'purelib', 'platlib',
++        self.convert_paths('base', 'platbase',
++                           'lib', 'purelib', 'platlib',
+                            'scripts', 'data', 'headers',
+                            'userbase', 'usersite')
+ 
+diff -urN a/Lib/distutils/util.py b/Lib/distutils/util.py
+--- a/Lib/distutils/util.py	2013-06-26 22:19:35.484270065 +0100
++++ b/Lib/distutils/util.py	2013-06-26 22:25:38.000000000 +0100
+@@ -130,6 +130,13 @@
+         paths.remove('.')
+     if not paths:
+         return os.curdir
++    # On Windows, if paths is ['C:','folder','subfolder'] then
++    # os.path.join(*paths) will return 'C:folder\subfolder' which
++    # is thus relative to the CWD on that drive. So we work around
++    # this by adding a \ to path[0]
++    if (len(paths) > 0 and paths[0].endswith(':') and
++        sys.platform == "win32" and sys.version.find("GCC") >= 0):
++        paths[0] += '\\'
+     return os.path.join(*paths)
+ 
+ # convert_path ()
+@@ -140,6 +147,10 @@
+     relative, this is equivalent to "os.path.join(new_root,pathname)".
+     Otherwise, it requires making 'pathname' relative and then joining the
+     two, which is tricky on DOS/Windows and Mac OS.
++
++    If on Windows or OS/2 and both new_root and pathname are on different
++    drives, raises DistutilsChangeRootError as this is nonsensical,
++    otherwise use drive which can be in either of new_root or pathname.
+     """
+     if os.name == 'posix':
+         if not os.path.isabs(pathname):
+@@ -147,17 +158,20 @@
+         else:
+             return os.path.join(new_root, pathname[1:])
+ 
+-    elif os.name == 'nt':
+-        (drive, path) = os.path.splitdrive(pathname)
+-        if path[0] == '\\':
+-            path = path[1:]
+-        return os.path.join(new_root, path)
+-
+-    elif os.name == 'os2':
++    elif os.name == 'nt' or os.name == 'os2':
+         (drive, path) = os.path.splitdrive(pathname)
+-        if path[0] == os.sep:
+-            path = path[1:]
+-        return os.path.join(new_root, path)
++        if path[0] == os.sep:
++            path = path[1:]
++        (drive_r, path_r) = os.path.splitdrive(new_root)
++        drive_used = ''
++        if len(drive) == 2 and len(drive_r) == 2 and drive != drive_r:
++            raise DistutilsChangeRootError, \
++                  "root and pathname not on same drive (%s, %s)" % (drive,drive_r)
++        elif len(drive_r) == 2:
++            drive_used = drive_r+os.sep
++        else:
++            drive_used = drive+os.sep
++        return os.path.join(drive_used+path_r, path)
+ 
+     else:
+         raise DistutilsPlatformError, \
+diff -urN a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in	2013-06-26 22:19:35.517603398 +0100
++++ b/Makefile.pre.in	2013-06-26 22:20:01.047603789 +0100
+@@ -1147,7 +1147,7 @@
+ 	   	--prefix=$(prefix) \
+ 		--install-scripts=$(BINDIR) \
+ 		--install-platlib=$(DESTSHARED) \
+-		--root=$(DESTDIR)/
++		--root=$(DESTDIR)
+ 	-rm $(DESTDIR)$(DESTSHARED)/_sysconfigdata.py*
+ 
+ # Here are a couple of targets for MacOSX again, to install a full
diff --git a/mingw-w64-python2/0105-mingw-MSYS-no-usr-lib-or-usr-include.patch b/mingw-w64-python2/0105-mingw-MSYS-no-usr-lib-or-usr-include.patch
new file mode 100644
index 0000000000..12b6de7bf2
--- /dev/null
+++ b/mingw-w64-python2/0105-mingw-MSYS-no-usr-lib-or-usr-include.patch
@@ -0,0 +1,29 @@
+diff -urN a/setup.py b/setup.py
+--- a/setup.py	2013-05-17 23:57:42.156508520 +0100
++++ b/setup.py	2013-05-17 23:57:42.538512843 +0100
+@@ -533,15 +533,16 @@
+         inc_dirs = self.compiler.include_dirs[:]
+         lib_dirs = self.compiler.library_dirs[:]
+         if not cross_compiling:
+-            for d in (
+-                '/usr/include',
+-                ):
+-                add_dir_to_list(inc_dirs, d)
+-            for d in (
+-                '/lib64', '/usr/lib64',
+-                '/lib', '/usr/lib',
+-                ):
+-                add_dir_to_list(lib_dirs, d)
++            if not (sys.version.find('GCC') and host_platform in ['mingw', 'win32']):
++                for d in (
++                    '/usr/include',
++                    ):
++                    add_dir_to_list(inc_dirs, d)
++                for d in (
++                    '/lib64', '/usr/lib64',
++                    '/lib', '/usr/lib',
++                    ):
++                    add_dir_to_list(lib_dirs, d)
+         exts = []
+         missing = []
+ 
diff --git a/mingw-w64-python2/0110-mingw-_PyNode_SizeOf-decl-fix.patch b/mingw-w64-python2/0110-mingw-_PyNode_SizeOf-decl-fix.patch
new file mode 100644
index 0000000000..9c8055f167
--- /dev/null
+++ b/mingw-w64-python2/0110-mingw-_PyNode_SizeOf-decl-fix.patch
@@ -0,0 +1,12 @@
+diff -urN a/Include/node.h b/Include/node.h
+--- a/Include/node.h	2013-05-17 23:57:42.847516341 +0100
++++ b/Include/node.h	2013-05-17 23:57:43.218520534 +0100
+@@ -21,7 +21,7 @@
+                                       char *str, int lineno, int col_offset);
+ PyAPI_FUNC(void) PyNode_Free(node *n);
+ #ifndef Py_LIMITED_API
+-Py_ssize_t _PyNode_SizeOf(node *n);
++PyAPI_FUNC(Py_ssize_t) _PyNode_SizeOf(node *n);
+ #endif
+ 
+ /* Node access functions */
diff --git a/mingw-w64-python2/0115-mingw-cross-includes-lower-case.patch b/mingw-w64-python2/0115-mingw-cross-includes-lower-case.patch
new file mode 100644
index 0000000000..71fed2c0be
--- /dev/null
+++ b/mingw-w64-python2/0115-mingw-cross-includes-lower-case.patch
@@ -0,0 +1,12 @@
+diff -urN a/Modules/socketmodule.h b/Modules/socketmodule.h
+--- a/Modules/socketmodule.h	2013-05-17 23:57:43.487523571 +0100
++++ b/Modules/socketmodule.h	2013-05-17 23:57:43.895528177 +0100
+@@ -28,7 +28,7 @@
+  * I use SIO_GET_MULTICAST_FILTER to detect a decent SDK.
+  */
+ # ifdef SIO_GET_MULTICAST_FILTER
+-#  include <MSTcpIP.h> /* for SIO_RCVALL */
++#  include <mstcpip.h> /* for SIO_RCVALL */
+ #  define HAVE_ADDRINFO
+ #  define HAVE_SOCKADDR_STORAGE
+ #  define HAVE_GETADDRINFO
diff --git a/mingw-w64-python2/0500-mingw-install-LDLIBRARY-to-LIBPL-dir.patch b/mingw-w64-python2/0500-mingw-install-LDLIBRARY-to-LIBPL-dir.patch
new file mode 100644
index 0000000000..1b08ab7770
--- /dev/null
+++ b/mingw-w64-python2/0500-mingw-install-LDLIBRARY-to-LIBPL-dir.patch
@@ -0,0 +1,11 @@
+diff -urN a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in	2013-05-17 23:57:44.206531683 +0100
++++ b/Makefile.pre.in	2013-05-17 23:57:44.578535872 +0100
+@@ -885,6 +885,7 @@
+ 	if test -f $(LDLIBRARY); then \
+ 		if test -n "$(DLLLIBRARY)" ; then \
+ 			$(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \
++			mkdir -p $(DESTDIR)$(LIBPL); $(INSTALL_SHARED) $(LDLIBRARY) $(DESTDIR)$(LIBPL); \
+ 		else \
+ 			$(INSTALL_SHARED) $(LDLIBRARY) $(DESTDIR)$(LIBDIR)/$(INSTSONAME); \
+ 			if test $(LDLIBRARY) != $(INSTSONAME); then \
diff --git a/mingw-w64-python2/0505-add-build-sysroot-config-option.patch b/mingw-w64-python2/0505-add-build-sysroot-config-option.patch
new file mode 100644
index 0000000000..72903c764a
--- /dev/null
+++ b/mingw-w64-python2/0505-add-build-sysroot-config-option.patch
@@ -0,0 +1,133 @@
+diff -urN a/configure.ac b/configure.ac
+--- a/configure.ac	2013-05-17 23:57:44.899539487 +0100
++++ b/configure.ac	2013-05-17 23:57:45.260543545 +0100
+@@ -558,6 +558,17 @@
+ CONFIGURE_MACOSX_DEPLOYMENT_TARGET=
+ EXPORT_MACOSX_DEPLOYMENT_TARGET='#'
+ 
++# There are certain cases where we don't want build machine's
++# sysroot folders (/usr/include, /usr/lib, /usr/lib64 etc) to
++# be used. An example of where this is needed is if running
++# on a 64bit machine via linux32 running a 32bit targetting GCC.
++# Without this, 64bit libs will cause the linker to fail.
++# This also prevents add_multiarch_paths from being called.
++# You can specify this multiple times to add more prefixes.
++AC_MSG_CHECKING(for --with-build-sysroot)
++AC_ARG_WITH([build-sysroot],
++AS_HELP_STRING([--with-build-sysroot], [Select sysroot and ignore multilibs, even when not cross-compiling]))
++
+ # checks for alternative programs
+ 
+ # compiler flags are generated in two sets, BASECFLAGS and OPT.  OPT is just
+diff -urN a/setup.py b/setup.py
+--- a/setup.py	2013-05-17 23:57:44.885539329 +0100
++++ b/setup.py	2013-05-17 23:57:45.260543545 +0100
+@@ -33,6 +33,16 @@
+ # Were we compiled --with-pydebug or with #define Py_DEBUG?
+ COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
+ 
++with_build_sysroot_args = [arg.split('=')[-1] for arg in sysconfig.get_config_var("CONFIG_ARGS").split()
++                           if ('--with-build-sysroot' in arg)]
++
++if len(with_build_sysroot_args):
++    with_build_sysroot_specified = True
++    with_build_sysroots = [arg.replace("'",'') for arg in with_build_sysroot_args]
++else:
++    with_build_sysroot_specified = False
++    with_build_sysroots = ['/usr']
++
+ # This global variable is used to hold the list of modules to be disabled.
+ disabled_module_list = []
+ 
+@@ -406,10 +416,11 @@
+             os.unlink(tmpfile)
+ 
+         if multiarch_path_component != '':
+-            add_dir_to_list(self.compiler.library_dirs,
+-                            '/usr/lib/' + multiarch_path_component)
+-            add_dir_to_list(self.compiler.include_dirs,
+-                            '/usr/include/' + multiarch_path_component)
++            for sysroot in with_build_sysroots:
++                add_dir_to_list(self.compiler.library_dirs,
++                                sysroot + '/lib/' + multiarch_path_component)
++                add_dir_to_list(self.compiler.include_dirs,
++                                sysroot + '/include/' + multiarch_path_component)
+             return
+ 
+         if not find_executable('dpkg-architecture'):
+@@ -427,10 +438,11 @@
+             if ret >> 8 == 0:
+                 with open(tmpfile) as fp:
+                     multiarch_path_component = fp.readline().strip()
+-                add_dir_to_list(self.compiler.library_dirs,
+-                                '/usr/lib/' + multiarch_path_component)
+-                add_dir_to_list(self.compiler.include_dirs,
+-                                '/usr/include/' + multiarch_path_component)
++                for sysroot in with_build_sysroots:
++                    add_dir_to_list(self.compiler.library_dirs,
++                                    sysroot + '/lib/' + multiarch_path_component)
++                    add_dir_to_list(self.compiler.include_dirs,
++                                    sysroot + '/include/' + multiarch_path_component)
+         finally:
+             os.unlink(tmpfile)
+ 
+@@ -468,7 +479,7 @@
+ 
+     def detect_modules(self):
+         # Ensure that /usr/local is always used
+-        if not cross_compiling:
++        if not cross_compiling and not with_build_sysroot_specified:
+             add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+         self.add_gcc_paths()
+@@ -532,7 +543,9 @@
+         # be assumed that no additional -I,-L directives are needed.
+         inc_dirs = self.compiler.include_dirs[:]
+         lib_dirs = self.compiler.library_dirs[:]
+-        if not cross_compiling:
++        # This bit was already questionable when I got here. I've
++        # disabled it when a build sysroot has been specified.
++        if not cross_compiling and not with_build_sysroot_specified:
+             if not (sys.version.find('GCC') and host_platform in ['mingw', 'win32']):
+                 for d in (
+                     '/usr/include',
+@@ -818,11 +831,11 @@
+             elif curses_library:
+                 readline_libs.append(curses_library)
+             elif self.compiler.find_library_file(lib_dirs +
+-                                                     ['/usr/lib/termcap'],
++                                                     [sr + '/lib/termcap' for sr in with_build_sysroots],
+                                                      'termcap'):
+                 readline_libs.append('termcap')
+             exts.append( Extension('readline', ['readline.c'],
+-                                   library_dirs=['/usr/lib/termcap'],
++                                   library_dirs=[sr + '/lib/termcap' for sr in with_build_sysroots],
+                                    extra_link_args=readline_extra_link_args,
+                                    libraries=readline_libs) )
+         else:
+@@ -849,20 +862,20 @@
+                                libraries=_socket_libs) )
+         # Detect SSL support for the socket module (via _ssl)
+         search_for_ssl_incs_in = [
+-                              '/usr/local/ssl/include',
+-                              '/usr/contrib/ssl/include/'
++                              sr + sslinc for sr in with_build_sysroots
++                              for sslinc in ('/local/ssl/include', '/contrib/ssl/include')
+                              ]
+         ssl_incs = find_file('openssl/ssl.h', inc_dirs,
+                              search_for_ssl_incs_in
+                              )
+         if ssl_incs is not None:
+             krb5_h = find_file('krb5.h', inc_dirs,
+-                               ['/usr/kerberos/include'])
++                               [sr + '/kerberos/include' for sr in with_build_sysroots])
+             if krb5_h:
+                 ssl_incs += krb5_h
+         ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
+-                                     ['/usr/local/ssl/lib',
+-                                      '/usr/contrib/ssl/lib/'
++                                     [sr + ssllib for sr in with_build_sysroots
++									  for ssllib in ('/local/ssl/lib', '/contrib/ssl/lib')
+                                      ] )
+ 
+         if (ssl_incs is not None and
diff --git a/mingw-w64-python2/0510-cross-PYTHON_FOR_BUILD-gteq-275-and-fullpath-it.patch b/mingw-w64-python2/0510-cross-PYTHON_FOR_BUILD-gteq-275-and-fullpath-it.patch
new file mode 100644
index 0000000000..b6bf7abbf0
--- /dev/null
+++ b/mingw-w64-python2/0510-cross-PYTHON_FOR_BUILD-gteq-275-and-fullpath-it.patch
@@ -0,0 +1,13 @@
+diff -urN a/configure.ac b/configure.ac
+--- a/configure.ac	2013-05-17 23:57:45.588547230 +0100
++++ b/configure.ac	2013-05-17 23:57:45.980551634 +0100
+@@ -21,7 +21,8 @@
+     if test -z "$PYTHON_FOR_BUILD"; then
+         for interp in python$PACKAGE_VERSION python2 python; do
+ 	    which $interp >/dev/null 2>&1 || continue
+-	    if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:2@:>@ >= (2,7) and sys.version_info@<:@0@:>@ < 3))'; then
++	    interp=$(which $interp)
++	    if $interp -c 'import sys;sys.exit(not (sys.version_info@<:@:3@:>@ >= (2,7,5) and sys.version_info@<:@0@:>@ < 3))'; then
+ 	        break
+ 	    fi
+             interp=
diff --git a/mingw-w64-python2/0515-mingw-add-GetModuleFileName-path-to-PATH.patch b/mingw-w64-python2/0515-mingw-add-GetModuleFileName-path-to-PATH.patch
new file mode 100644
index 0000000000..11b8c9c51a
--- /dev/null
+++ b/mingw-w64-python2/0515-mingw-add-GetModuleFileName-path-to-PATH.patch
@@ -0,0 +1,45 @@
+diff -urN a/Modules/getpath.c b/Modules/getpath.c
+--- a/Modules/getpath.c	2013-05-17 23:57:46.258554750 +0100
++++ b/Modules/getpath.c	2013-05-17 23:57:46.683559513 +0100
+@@ -131,9 +131,9 @@
+ 
+ static char prefix[MAXPATHLEN+1];
+ static char exec_prefix[MAXPATHLEN+1];
+-static char progpath[MAXPATHLEN+1];
++static char progpath[MAXPATHLEN+1] = {'\0'};
+ #ifdef MS_WINDOWS
+-static char dllpath[MAXPATHLEN+1];
++static char dllpath[MAXPATHLEN+1] = {'\0'};
+ extern HANDLE PyWin_DLLhModule;
+ #endif
+ static char *module_search_path = NULL;
+@@ -726,6 +726,29 @@
+     }
+     else
+         strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
++#ifdef MS_WINDOWS
++    if (module_search_path) {
++        /* Add path of executable/dll to system path. This
++         * is so that the correct tcl??.dll and tk??.dll get
++         * used. */
++        char *module_path = dllpath[0] ? dllpath : progpath;
++        char *new_path = alloca(strlen("PATH=")+strlen(path)+1+strlen(dllpath)+1);
++        if (new_path) {
++            strcpy( new_path, "PATH=" );
++            strcat( new_path, module_path );
++            char *slashes = strchr( new_path, '/' );
++            while (slashes) {
++                *slashes = '\\';
++                slashes = strchr( slashes+1, '/' );
++            }
++            char *end = strrchr(new_path, '\\') ? strrchr(new_path, '\\') : new_path + strlen(new_path);
++            end[0] = ';';
++            end[1] = '\0';
++            strcat( new_path, path );
++            _putenv( new_path );
++        }
++    }
++#endif
+ }
+ 
+ 
diff --git a/mingw-w64-python2/0520-Add-interp-Python-DESTSHARED-to-PYTHONPATH-b4-pybuilddir-txt-dir.patch b/mingw-w64-python2/0520-Add-interp-Python-DESTSHARED-to-PYTHONPATH-b4-pybuilddir-txt-dir.patch
new file mode 100644
index 0000000000..a781a4193f
--- /dev/null
+++ b/mingw-w64-python2/0520-Add-interp-Python-DESTSHARED-to-PYTHONPATH-b4-pybuilddir-txt-dir.patch
@@ -0,0 +1,17 @@
+diff -urN a/configure.ac b/configure.ac
+--- a/configure.ac	2013-05-17 23:57:47.009563166 +0100
++++ b/configure.ac	2013-05-17 23:57:47.376567268 +0100
+@@ -31,7 +31,12 @@
+ 	    AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
+ 	fi
+         AC_MSG_RESULT($interp)
+-	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp
++	# For reference see: http://bugs.python.org/msg180577
++	# interp's DESTSHARED must appear before that contained in pybuilddir.txt as otherwise, when compiling during make install,
++	# the build Python will attempt to load shared modules from the host Python, which will fail due to them being of the wrong
++	# architecture (e.g. x86_64 vs x86 or arm). It would probably be better if _sysconfigdata.py was placed elsewhere,
++	# i.e. in a folder that does not also contain incompatible shared modules.
++	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH='$($interp -c "import sysconfig; print sysconfig.get_config_var(\"DESTSHARED\")")':$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp
+     fi
+ elif test "$cross_compiling" = maybe; then
+     AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
diff --git a/mingw-w64-python2/0525-msys-monkeypatch-os-system-via-sh-exe.patch b/mingw-w64-python2/0525-msys-monkeypatch-os-system-via-sh-exe.patch
new file mode 100644
index 0000000000..333363dc97
--- /dev/null
+++ b/mingw-w64-python2/0525-msys-monkeypatch-os-system-via-sh-exe.patch
@@ -0,0 +1,21 @@
+diff -urN a/setup.py b/setup.py
+--- a/setup.py	Sun May 19 13:33:24 2013
++++ b/setup.py	Sun May 19 13:34:19 2013
+@@ -30,6 +30,17 @@
+     return sys.platform
+ host_platform = get_platform()
+ 
++# On MSYS, os.system needs to be wrapped with sh.exe
++# as otherwise all the io redirection will fail.
++# Arguably, this could happen inside the real os.system
++# rather than this monkey patch.
++if sys.platform == "win32" and "MSYSTEM" in os.environ:
++    os_system = os.system
++    def msys_system(command):
++        command_in_sh = 'sh.exe -c "%s"' % command.replace("\\", "/")
++        return os_system(command_in_sh)
++    os.system = msys_system
++
+ # Were we compiled --with-pydebug or with #define Py_DEBUG?
+ COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
+ 
diff --git a/mingw-w64-python2/PKGBUILD b/mingw-w64-python2/PKGBUILD
new file mode 100644
index 0000000000..fdc0884db3
--- /dev/null
+++ b/mingw-w64-python2/PKGBUILD
@@ -0,0 +1,215 @@
+# Maintainer: Alexey Pavlov <alexpux@gmail.com>
+
+_realname=python2
+_mingw_suff=mingw-w64-${CARCH}
+pkgname="${_mingw_suff}-${_realname}"
+pkgver=2.7.6
+pkgrel=1
+_pybasever=2.7
+pkgdesc="A high-level scripting language (mingw-w64)"
+arch=('any')
+license=('PSF')
+url="http://www.python.org/"
+depends=("${_mingw_suff}-crt" 
+		"${_mingw_suff}-expat"
+		"${_mingw_suff}-bzip2"
+		"${_mingw_suff}-readline"
+		"${_mingw_suff}-openssl"
+		"${_mingw_suff}-libffi"
+		"${_mingw_suff}-zlib")
+makedepends=("${_mingw_suff}-gcc" "${_mingw_suff}-pkg-config" "${_mingw_suff}-ncurses")
+options=('!makeflags' 'staticlibs' 'strip')
+source=("http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"
+0005-MINGW.patch
+0006-mingw-removal-of-libffi-patch.patch
+0007-mingw-system-libffi.patch
+0010-mingw-osdefs-DELIM.patch
+0015-mingw-use-posix-getpath.patch
+0020-mingw-w64-test-for-REPARSE_DATA_BUFFER.patch
+0025-mingw-regen-with-stddef-instead.patch
+0030-mingw-add-libraries-for-_msi.patch
+0035-MSYS-add-MSYSVPATH-AC_ARG.patch
+0040-mingw-cygwinccompiler-use-CC-envvars-and-ld-from-print-prog-name.patch
+0045-cross-darwin.patch
+0050-mingw-sysconfig-like-posix.patch
+0055-mingw-pdcurses_ISPAD.patch
+0060-mingw-static-tcltk.patch
+0065-mingw-x86_64-size_t-format-specifier-pid_t.patch
+0070-python-disable-dbm.patch
+0075-add-python-config-sh.patch
+0080-mingw-nt-threads-vs-pthreads.patch
+0085-cross-dont-add-multiarch-paths-if.patch
+0090-mingw-reorder-bininstall-ln-symlink-creation.patch
+0095-mingw-use-backslashes-in-compileall-py.patch
+0100-mingw-distutils-MSYS-convert_path-fix-and-root-hack.patch
+0105-mingw-MSYS-no-usr-lib-or-usr-include.patch
+0110-mingw-_PyNode_SizeOf-decl-fix.patch
+0115-mingw-cross-includes-lower-case.patch
+0500-mingw-install-LDLIBRARY-to-LIBPL-dir.patch
+0505-add-build-sysroot-config-option.patch
+0510-cross-PYTHON_FOR_BUILD-gteq-275-and-fullpath-it.patch
+0515-mingw-add-GetModuleFileName-path-to-PATH.patch
+0520-Add-interp-Python-DESTSHARED-to-PYTHONPATH-b4-pybuilddir-txt-dir.patch
+0525-msys-monkeypatch-os-system-via-sh-exe.patch
+9999-re-configure-d.patch)
+sha1sums=('8321636af2acbeaa68fc635d7dda7369ed446a80'  # 2.7.6
+		  '8553bbf96560f04c0cc85d8418c1f6b818feee3b'
+          'bb71f24b42a80a5f3f260e553c9afa433fa4243e'
+		  '46fffbb6fd41ce615cb8cd1b2e13994bef6c473d'
+          '74abdb55e43f27e6c42b8c73a51bda74da21c742'
+          '0e2b7be0bb1cb97c9047e806916a2d41c5830803'
+          '5cae3234f71ae9eccdfb0aaaaee211604b4c428a'
+          '5ce21c8e7db57cfaf001985230585e84db079d9b'
+          'dea45873221c2cec00d82956085570d6028e094a'
+          'ec555577e117511217a8040e072e332498d7792d'
+          'e5ce9b07bef3a10472ede90a5c6f7c48e59cee90'
+          '4d4c4c44ce324a34e3c91de8e1c982b2a4405c0e'
+          'ce4a1c0aca20d3f38c6ab7ba5dfac307fe759c1c'
+          '996af9c6d216257f054ca045b27436a8b70064c3'
+          '7ea2e8be856818f119bd4300cc51e4364b2d3e46'
+          'e2ea748ce60bfc0c6860f1486d5ad98810d18045'
+          '49cffa94a7366387ac25a35e42f66c2284deeafa'
+          '8045fd8ab9cc2b8eb3b7cf49800954bc35a1d650'
+          '20867037dd91e4693a33005ffe320780a277b1d0'
+          'cf2c5b2ce3fdbbb872c9e46c1671706031528df1'
+          'd99db43152709de6aef6366413762985158ee4ef'
+          '46b76dd6714f1d5974dd5ba97ab2354dc5480651'
+          '940c4d6d51f7359262970356bb5ef32bfa98bf99'
+          '3835ed1571384657d115a0cbd1551c2dd3bd52dd'
+          '59648afbb6fd1259545de19f370112dd6bf0d50c'
+          'de31e6cb8e77d65cf664d0d4aba95995a140abc0'
+          '2f3ae8256f9c97e5f410ad976771c31ee9d0bb3c'
+		  '7dac10e6c4b37cb583634a06ce98198c3ada0106'
+          '060e1f3e3555c89719bdd54c00806fc4870686bc'
+          '9ca35d09d769abc6c49b01b0c1da8be7b1e69265'
+          '0b373dc92b0dddb13f9503c31214eca74381e7ca'
+          'bbf1ebeaa9a2f7b8b810c6b62143c851810759fb'
+          '55df9fd7e75fa007203b80373b91ba9c2e4d1e40')
+
+prepare() {
+  cd "${srcdir}/Python-${pkgver}"
+  rm -f Modules/_ctypes/libffi_msvc/win32.S Python/fileblocks.c Misc/python-config.sh.in
+  patch -Np1 -i "${srcdir}"/0005-MINGW.patch
+  patch -Np1 -i "${srcdir}"/0006-mingw-removal-of-libffi-patch.patch
+  patch -Np1 -i "${srcdir}"/0007-mingw-system-libffi.patch
+  patch -Np1 -i "${srcdir}"/0010-mingw-osdefs-DELIM.patch
+  patch -Np1 -i "${srcdir}"/0015-mingw-use-posix-getpath.patch
+  patch -Np1 -i "${srcdir}"/0020-mingw-w64-test-for-REPARSE_DATA_BUFFER.patch
+  patch -Np1 -i "${srcdir}"/0025-mingw-regen-with-stddef-instead.patch
+  patch -Np1 -i "${srcdir}"/0030-mingw-add-libraries-for-_msi.patch
+  patch -Np1 -i "${srcdir}"/0035-MSYS-add-MSYSVPATH-AC_ARG.patch
+  patch -Np1 -i "${srcdir}"/0040-mingw-cygwinccompiler-use-CC-envvars-and-ld-from-print-prog-name.patch
+  patch -Np1 -i "${srcdir}"/0045-cross-darwin.patch
+  patch -Np1 -i "${srcdir}"/0050-mingw-sysconfig-like-posix.patch
+  patch -Np1 -i "${srcdir}"/0055-mingw-pdcurses_ISPAD.patch
+  patch -Np1 -i "${srcdir}"/0060-mingw-static-tcltk.patch
+  patch -Np1 -i "${srcdir}"/0065-mingw-x86_64-size_t-format-specifier-pid_t.patch
+  patch -Np1 -i "${srcdir}"/0070-python-disable-dbm.patch
+  patch -Np1 -i "${srcdir}"/0075-add-python-config-sh.patch
+  patch -Np1 -i "${srcdir}"/0080-mingw-nt-threads-vs-pthreads.patch 
+  #patch -Np1 -i "${srcdir}"/0085-cross-dont-add-multiarch-paths-if.patch 
+  patch -Np1 -i "${srcdir}"/0090-mingw-reorder-bininstall-ln-symlink-creation.patch
+  patch -Np1 -i "${srcdir}"/0095-mingw-use-backslashes-in-compileall-py.patch
+  patch -Np1 -i "${srcdir}"/0100-mingw-distutils-MSYS-convert_path-fix-and-root-hack.patch
+  patch -Np1 -i "${srcdir}"/0105-mingw-MSYS-no-usr-lib-or-usr-include.patch
+  patch -Np1 -i "${srcdir}"/0110-mingw-_PyNode_SizeOf-decl-fix.patch
+  patch -Np1 -i "${srcdir}"/0115-mingw-cross-includes-lower-case.patch
+  patch -Np1 -i "${srcdir}"/0500-mingw-install-LDLIBRARY-to-LIBPL-dir.patch
+  patch -Np1 -i "${srcdir}"/0505-add-build-sysroot-config-option.patch
+  patch -Np1 -i "${srcdir}"/0510-cross-PYTHON_FOR_BUILD-gteq-275-and-fullpath-it.patch
+  patch -Np1 -i "${srcdir}"/0515-mingw-add-GetModuleFileName-path-to-PATH.patch
+  patch -Np1 -i "${srcdir}"/0520-Add-interp-Python-DESTSHARED-to-PYTHONPATH-b4-pybuilddir-txt-dir.patch
+  patch -Np1 -i "${srcdir}"/0525-msys-monkeypatch-os-system-via-sh-exe.patch
+
+  autoreconf -vfi
+  
+  # Temporary workaround for FS#22322
+  # See http://bugs.python.org/issue10835 for upstream report
+  sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
+
+  # Enable built-in SQLite module to load extensions (fix FS#22122)
+  sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
+
+  # FS#23997
+  sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
+
+  sed -i "s/python2.3/python2/g" Lib/distutils/tests/test_build_scripts.py \
+     Lib/distutils/tests/test_install_scripts.py Tools/scripts/gprof2html.py
+  
+  touch Include/graminit.h
+  touch Python/graminit.c
+  touch Parser/Python.asdl
+  touch Parser/asdl.py
+  touch Parser/asdl_c.py
+  touch Include/Python-ast.h
+  touch Python/Python-ast.c
+  echo \"\" > Parser/pgen.stamp
+		
+  # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
+  # rather than copies shipped in the tarball
+  rm -r Modules/expat
+  rm -r Modules/zlib
+  rm -r Modules/_ctypes/{darwin,libffi}*
+  
+}
+
+build() {
+  pushd ${MINGW_PREFIX} > /dev/null
+  export PREFIX_WIN=`pwd -W`
+  popd > /dev/null
+
+  CFLAGS+="-O2 -pipe -fwrapv -DNDEBUG -D__USE_MINGW_ANSI_STDIO=1 -I$PREFIX_WIN/${MINGW_CHOST}/include"
+  CXXFLAGS+="-O2 -pipe -fwrapv -DNDEBUG -D__USE_MINGW_ANSI_STDIO=1 -I$PREFIX_WIN/include -I$PREFIX_WIN/include/ncursesw -I$MINGWHOME_WIN/$HOST/include"
+  CPPFLAGS+="-O2 -pipe -I$PREFIX_WIN/include -I$PREFIX_WIN/include/ncursesw -I$PREFIX_WIN/${MINGW_CHOST}/include"
+  LDFLAGS="-pipe -s -L$PREFIX_WIN/${MINGW_CHOST}/lib -L$PREFIX_WIN/lib"
+  
+  LIBFFI_INC=`${MINGW_PREFIX}/bin/pkg-config libffi --cflags-only-I | sed "s|\-I||g"`
+  pushd ${LIBFFI_INC} > /dev/null
+  export LIBFFI_INCLUDEDIR=`pwd -W`
+  popd > /dev/null
+  
+  # Workaround for conftest error on 64-bit builds
+  export ac_cv_working_tzset=no
+	
+  mkdir -p "${srcdir}/build-${CARCH}" && cd "${srcdir}/build-${CARCH}"
+  MSYSTEM=MINGW ../Python-${pkgver}/configure \
+      --prefix=${pkgdir}${MINGW_PREFIX} \
+      --host=${MINGW_CHOST} \
+      --build=${MINGW_CHOST} \
+      --enable-shared \
+      --with-threads \
+      --with-system-expat \
+      --with-system-ffi \
+	  OPT="" \
+	  CXX=g++
+      # --with-dbmliborder=gdbm:ndbm
+    make
+}
+
+package() {
+    cd "${srcdir}/build-${CARCH}"
+    make install # DESTDIR="$pkgdir"
+    mv "${pkgdir}${MINGW_PREFIX}"/bin/smtpd.py "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/
+
+	cp -f "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config/libpython${_pybasever}.dll.a "${pkgdir}${MINGW_PREFIX}"/lib/libpython${_pybasever}.dll.a
+
+	# some useful "stuff"
+	install -dm755 "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/Tools/{i18n,scripts}
+	install -m755 "${srcdir}/Python-${pkgver}"/Tools/i18n/{msgfmt,pygettext}.py "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/Tools/i18n/
+	install -m755 "${srcdir}/Python-${pkgver}"/Tools/scripts/{README,*py} "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/Tools/scripts/
+
+	# clean up #!s
+	find "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/ -name '*.py' | \
+		xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
+
+	# clean-up reference to build directory
+	sed -i "s#${srcdir}/Python-${pkgver}:##" "${pkgdir}${MINGW_PREFIX}"/lib/python${_pybasever}/config/Makefile
+	
+	#sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|"
+	sed -i "s|#!${pkgdir}${MINGW_PREFIX}/bin/python${_pybasever}.exe|#!python2|" "${pkgdir}${MINGW_PREFIX}"/bin/python${_pybasever}-config
+	sed -i "s|#!${pkgdir}${MINGW_PREFIX}/bin/python${_pybasever}.exe|#!python2|" "${pkgdir}${MINGW_PREFIX}"/bin/python2-config
+	sed -i "s|#!${pkgdir}${MINGW_PREFIX}/bin/python${_pybasever}.exe|#!python2|" "${pkgdir}${MINGW_PREFIX}"/bin/python-config
+	
+	# fix permissons
+	find ${pkgdir}${MINGW_PREFIX} -type f \( -name *.dll -o -name *.exe \) | xargs chmod 0755
+}