diff --git a/mingw-w64-python3/0940-mingw-w64-Also-define-_Py_BEGIN_END_SUPPRESS_IPH-when-Py_BUILD_CORE_MODULE.patch b/mingw-w64-python3/0940-mingw-w64-Also-define-_Py_BEGIN_END_SUPPRESS_IPH-when-Py_BUILD_CORE_MODULE.patch
new file mode 100644
index 0000000000..a94ccf8ea6
--- /dev/null
+++ b/mingw-w64-python3/0940-mingw-w64-Also-define-_Py_BEGIN_END_SUPPRESS_IPH-when-Py_BUILD_CORE_MODULE.patch
@@ -0,0 +1,11 @@
+--- Python-3.5.0/Include/pyport.h.orig	2015-10-05 01:44:27.804874500 +0100
++++ Python-3.5.0/Include/pyport.h	2015-10-05 02:07:01.998193900 +0100
+@@ -896,7 +896,7 @@
+ #define PY_LITTLE_ENDIAN 1
+ #endif
+ 
+-#ifdef Py_BUILD_CORE 
++#if defined Py_BUILD_CORE || defined Py_BUILD_CORE_MODULE
+ /*
+  * Macros to protect CRT calls against instant termination when passed an
+  * invalid parameter (issue23524).
diff --git a/mingw-w64-python3/PKGBUILD b/mingw-w64-python3/PKGBUILD
index dacb993cac..d4e25ca80c 100644
--- a/mingw-w64-python3/PKGBUILD
+++ b/mingw-w64-python3/PKGBUILD
@@ -14,6 +14,7 @@
 #         -DGNOMELOCALEDIR=\"/mingw64/share/locale\"
 
 _realname=python3
+pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 _pybasever=3.5
 pkgver=${_pybasever}.0
@@ -118,6 +119,7 @@ source=("http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"
         0910-fix-using-dllhandle-and-winver-mingw.patch
         0920-mingw-add-LIBPL-to-library-dirs.patch
         0930-mingw-w64-build-overlapped-module.patch
+        0940-mingw-w64-Also-define-_Py_BEGIN_END_SUPPRESS_IPH-when-Py_BUILD_CORE_MODULE.patch
         1000-fix-building-posixmodule.patch
         1010-install-msilib.patch
         1500-mingw-w64-dont-look-in-DLLs-folder-for-python-dll.patch)
@@ -219,6 +221,7 @@ prepare() {
   patch -Np1 -i "${srcdir}"/0910-fix-using-dllhandle-and-winver-mingw.patch
   patch -Np1 -i "${srcdir}"/0920-mingw-add-LIBPL-to-library-dirs.patch
   patch -Np1 -i "${srcdir}"/0930-mingw-w64-build-overlapped-module.patch
+  patch -Np1 -i "${srcdir}"/0940-mingw-w64-Also-define-_Py_BEGIN_END_SUPPRESS_IPH-when-Py_BUILD_CORE_MODULE.patch
 
   patch -Np1 -i "${srcdir}"/1000-fix-building-posixmodule.patch
   patch -Np1 -i "${srcdir}"/1010-install-msilib.patch
@@ -457,6 +460,7 @@ sha1sums=('871a06df9ab70984b7398ac53047fe125c757a70'
           'e1a155cca50fe1fe4f450ff631ecbdbcc845aa83'
           'ce026983639b7e5e503b32345bbcf81972447868'
           '8ca0fdb71ee8198997b30466c367ac0c84f14237'
+          '4564e95c83e30dca025d6a7ecf0b24a709ea5120'
           'a97dbe5299385b9fde442779d00f9a161ef3f950'
           'd5c9e4e47db62db241f4488d9bc974b083b7b0e3'
           'c7eb543aee59f4c246018fa7943a1eaa12e6809c')