diff --git a/mingw-w64-python-numpy/detect-mingw-environment.patch b/mingw-w64-python-numpy/0001-detect-mingw-environment.patch
similarity index 100%
rename from mingw-w64-python-numpy/detect-mingw-environment.patch
rename to mingw-w64-python-numpy/0001-detect-mingw-environment.patch
diff --git a/mingw-w64-python-numpy/fix-finding-python2.patch b/mingw-w64-python-numpy/0002-fix-finding-python2.patch
similarity index 100%
rename from mingw-w64-python-numpy/fix-finding-python2.patch
rename to mingw-w64-python-numpy/0002-fix-finding-python2.patch
diff --git a/mingw-w64-python-numpy/gfortran-better-version-check.patch b/mingw-w64-python-numpy/0003-gfortran-better-version-check.patch
similarity index 100%
rename from mingw-w64-python-numpy/gfortran-better-version-check.patch
rename to mingw-w64-python-numpy/0003-gfortran-better-version-check.patch
diff --git a/mingw-w64-python-numpy/fix-testsuite.patch b/mingw-w64-python-numpy/0004-fix-testsuite.patch
similarity index 100%
rename from mingw-w64-python-numpy/fix-testsuite.patch
rename to mingw-w64-python-numpy/0004-fix-testsuite.patch
diff --git a/mingw-w64-python-numpy/mincoming-stack-boundary-only-32bit.patch b/mingw-w64-python-numpy/0005-mincoming-stack-boundary-32bit-optimized-64bit.patch
similarity index 100%
rename from mingw-w64-python-numpy/mincoming-stack-boundary-only-32bit.patch
rename to mingw-w64-python-numpy/0005-mincoming-stack-boundary-32bit-optimized-64bit.patch
diff --git a/mingw-w64-python-numpy/disable-visualcompaq-for-mingw.patch b/mingw-w64-python-numpy/0006-disable-visualcompaq-for-mingw.patch
similarity index 100%
rename from mingw-w64-python-numpy/disable-visualcompaq-for-mingw.patch
rename to mingw-w64-python-numpy/0006-disable-visualcompaq-for-mingw.patch
diff --git a/mingw-w64-python2/0970-Add-AMD64-to-sys-config-so-msvccompiler-get_build_version-works.patch b/mingw-w64-python2/0970-Add-AMD64-to-sys-config-so-msvccompiler-get_build_version-works.patch
new file mode 100644
index 0000000000..80656671a9
--- /dev/null
+++ b/mingw-w64-python2/0970-Add-AMD64-to-sys-config-so-msvccompiler-get_build_version-works.patch
@@ -0,0 +1,26 @@
+--- Python-2.7.10/Python/getcompiler.c.orig	2015-05-23 17:09:24.000000000 +0100
++++ Python-2.7.10/Python/getcompiler.c	2016-01-02 17:10:40.399949300 +0000
+@@ -6,7 +6,22 @@
+ #ifndef COMPILER
+ 
+ #ifdef __GNUC__
+-#define COMPILER "\n[GCC " __VERSION__ "]"
++/* To not break compatibility with things that determine
++   CPU arch by calling get_build_version in msvccompiler.py
++   (such as NumPy) add "32 bit" or "64 bit (AMD64)" on Windows
++   and also use a space as a separator rather than a newline. */
++#if defined(_WIN32)
++#define COMP_SEP " "
++#if defined(__x86_64__)
++#define ARCH_SUFFIX " 64 bit (AMD64)"
++#else
++#define ARCH_SUFFIX " 32 bit"
++#endif
++#else
++#define COMP_SEP "\n"
++#define ARCH_SUFFIX ""
++#endif
++#define COMPILER COMP_SEP "[GCC " __VERSION__ ARCH_SUFFIX "]"
+ #endif
+ 
+ #endif /* !COMPILER */
diff --git a/mingw-w64-python2/PKGBUILD b/mingw-w64-python2/PKGBUILD
index cc79591f6c..5ad10eacfe 100644
--- a/mingw-w64-python2/PKGBUILD
+++ b/mingw-w64-python2/PKGBUILD
@@ -3,9 +3,10 @@
 # Contributor: Saul Ibarra Corretge <saghul@gmail.com>
 
 _realname=python2
+pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=2.7.10
-pkgrel=8
+pkgver=2.7.11
+pkgrel=1
 _pybasever=${pkgver%.*}
 pkgdesc="A high-level scripting language (mingw-w64)"
 arch=('any')
@@ -100,6 +101,7 @@ source=("http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"
         0860-mingw-build-optimized-ext.patch
         0870-mingw-add-LIBPL-to-library-dirs.patch
         0910-fix-using-dllhandle-and-winver-mingw.patch
+        0970-Add-AMD64-to-sys-config-so-msvccompiler-get_build_version-works.patch
         1000-dont-link-with-gettext.patch
         1010-ctypes-python-dll.patch
         1020-gdbm-module-includes.patch
@@ -202,6 +204,7 @@ prepare() {
   patch -p1 -i "${srcdir}"/0860-mingw-build-optimized-ext.patch
   patch -p1 -i "${srcdir}"/0870-mingw-add-LIBPL-to-library-dirs.patch
   patch -p1 -i "${srcdir}"/0910-fix-using-dllhandle-and-winver-mingw.patch
+  patch -p1 -i "${srcdir}"/0970-Add-AMD64-to-sys-config-so-msvccompiler-get_build_version-works.patch
 
   plain "Apply Alexey Pavlov's mingw-w64 patches (2)"
   patch -p1 -i "${srcdir}"/1000-dont-link-with-gettext.patch
@@ -367,7 +370,7 @@ package() {
   mv "${pkgdir}"${MINGW_PREFIX}/bin/${_exename}_exe "${pkgdir}"${MINGW_PREFIX}/bin/${_exename}.exe
 }
 
-sha1sums=('ee5a50c5562e7448f037d35fdedc18d95c748b9e'
+sha1sums=('c3b8bbe3f084c4d4ea13ffb03d75a5e22f9756ff'
           '5e0546d246c18881c448a077c3b605d5db505114'
           '901520b94c17ca80263ab3ac146b9c024bf1dc71'
           '34a627481caea8690c2cf6e6d409e2d449d133fb'
@@ -442,6 +445,7 @@ sha1sums=('ee5a50c5562e7448f037d35fdedc18d95c748b9e'
           'de01d87f5070992f305d5375da1deb69f80ea8bb'
           '6cef2b44a41279c0344cbb9f3486cfc0831026ae'
           '0de22d55a78fad4755e2d4950db9a49a48a50ad2'
+          '6473ae1b2108c26403022c6846e562d2cfff9727'
           'd332da5a091d54445e1a83075a6ea8069031c995'
           'bc7209fd529f03d384f00be22835615a2843a7fa'
           '06ebbcf50d6d30780f47a0d3425f956b2eb8e847'
diff --git a/mingw-w64-python3/0001-fix-_nt_quote_args-using-subprocess-list2cmdline.patch b/mingw-w64-python3/0001-fix-_nt_quote_args-using-subprocess-list2cmdline.patch
index 09b1f3e9f4..883592a3e2 100644
--- a/mingw-w64-python3/0001-fix-_nt_quote_args-using-subprocess-list2cmdline.patch
+++ b/mingw-w64-python3/0001-fix-_nt_quote_args-using-subprocess-list2cmdline.patch
@@ -31,3 +31,18 @@
      return args
  
  def _spawn_nt(cmd, search_path=1, verbose=0, dry_run=0):
+--- Python-3.5.0/setup.py.orig	2016-01-01 23:31:43.768193600 +0000
++++ Python-3.5.0/setup.py	2016-01-01 23:54:46.268820600 +0000
+@@ -1208,11 +1208,7 @@
+                 '_sqlite/statement.c',
+                 '_sqlite/util.c', ]
+ 
+-            sqlite_defines = []
+-            if host_platform != "win32":
+-                sqlite_defines.append(('MODULE_NAME', '"sqlite3"'))
+-            else:
+-                sqlite_defines.append(('MODULE_NAME', '\\"sqlite3\\"'))
++            sqlite_defines = [('MODULE_NAME', '"sqlite3"')]
+ 
+             # Enable support for loadable extensions in the sqlite3 module
+             # if --enable-loadable-sqlite-extensions configure option is used.
diff --git a/mingw-w64-python3/PKGBUILD b/mingw-w64-python3/PKGBUILD
index 1d89467120..4466021598 100644
--- a/mingw-w64-python3/PKGBUILD
+++ b/mingw-w64-python3/PKGBUILD
@@ -18,7 +18,7 @@ pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 _pybasever=3.5
 pkgver=${_pybasever}.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A high-level scripting language (mingw-w64)"
 arch=('any')
 license=('PSF')
@@ -123,6 +123,8 @@ source=("http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"
         0940-mingw-w64-Also-define-_Py_BEGIN_END_SUPPRESS_IPH-when-Py_BUILD_CORE_MODULE.patch
         0950-mingw-w64-XP3-compat-GetProcAddress-GetTickCount64.patch
         0960-mingw-w64-XP3-compat-GetProcAddress-GetFinalPathNameByHandleW.patch
+        0970-Add-AMD64-to-sys-config-so-msvccompiler-get_build_version-works.patch
+
         1000-fix-building-posixmodule.patch
         1010-install-msilib.patch
         1500-mingw-w64-dont-look-in-DLLs-folder-for-python-dll.patch)
@@ -228,6 +230,7 @@ prepare() {
   patch -Np1 -i "${srcdir}"/0940-mingw-w64-Also-define-_Py_BEGIN_END_SUPPRESS_IPH-when-Py_BUILD_CORE_MODULE.patch
   patch -Np1 -i "${srcdir}"/0950-mingw-w64-XP3-compat-GetProcAddress-GetTickCount64.patch
   patch -Np1 -i "${srcdir}"/0960-mingw-w64-XP3-compat-GetProcAddress-GetFinalPathNameByHandleW.patch
+  patch -Np1 -i "${srcdir}"/0970-Add-AMD64-to-sys-config-so-msvccompiler-get_build_version-works.patch
 
   patch -Np1 -i "${srcdir}"/1000-fix-building-posixmodule.patch
   patch -Np1 -i "${srcdir}"/1010-install-msilib.patch
@@ -257,10 +260,10 @@ prepare() {
   rm -r Modules/_ctypes/{darwin,libffi}*
 }
 
-check() {
-  cd "${srcdir}/build-${CARCH}"
-  make test EXTRATESTOPTS="-v"
-}
+# check() {
+#   cd "${srcdir}/build-${CARCH}"
+#   make test EXTRATESTOPTS="-v"
+# }
 
 build() {
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
@@ -387,7 +390,7 @@ package() {
 
 sha1sums=('871a06df9ab70984b7398ac53047fe125c757a70'
           '87bbcdc0f0ca1e1d23dd9822566efe91d6bd8a85'
-          '875375f2ef44eaf530121f50419d2ad9be24af58'
+          'ab513dfa2e0902084ae92409bfdfd25e6a5286e2'
           'e6358136f1f340de833365ef3cc2cebee5ea300b'
           'db10f4f2b451217996fb0c461d893e6f8d8ce005'
           '840e903fd99ccac2a66d177906f103a461ae841b'
@@ -470,6 +473,7 @@ sha1sums=('871a06df9ab70984b7398ac53047fe125c757a70'
           '4564e95c83e30dca025d6a7ecf0b24a709ea5120'
           '79ff9a468dcfd2c55afa70758bd6a50b2a940ed4'
           '2bf23da1017ab6ed5bc59c4f3fbf713093036a09'
+          '6473ae1b2108c26403022c6846e562d2cfff9727'
           'a97dbe5299385b9fde442779d00f9a161ef3f950'
           'd5c9e4e47db62db241f4488d9bc974b083b7b0e3'
           'c7eb543aee59f4c246018fa7943a1eaa12e6809c')
diff --git a/mingw-w64-python3/Python-3.5.0/0970-Add-AMD64-to-sys-config-so-msvccompiler-get_build_version-works.patch b/mingw-w64-python3/Python-3.5.0/0970-Add-AMD64-to-sys-config-so-msvccompiler-get_build_version-works.patch
new file mode 100644
index 0000000000..d277f07df2
--- /dev/null
+++ b/mingw-w64-python3/Python-3.5.0/0970-Add-AMD64-to-sys-config-so-msvccompiler-get_build_version-works.patch
@@ -0,0 +1,19 @@
+--- Python-3.5.0/Python/getcompiler.c.orig	2015-05-23 17:09:24.000000000 +0100
++++ Python-3.5.0/Python/getcompiler.c	2016-01-02 15:13:57.737265800 +0000
+@@ -6,7 +6,15 @@
+ #ifndef COMPILER
+ 
+ #ifdef __GNUC__
+-#define COMPILER "\n[GCC " __VERSION__ "]"
++/* To retain compatibility with things that determine
++   CPU arch by calling get_build_version in msvccompiler.py
++   (such as NumPy) we add (AMD64) for 64-bit Windows. */
++#if defined(_WIN32) && defined(__x86_64__)
++#define ARCH_SUFFIX " (AMD64)"
++#else
++#define ARCH_SUFFIX ""
++#endif
++#define COMPILER "\n[GCC " __VERSION__ ARCH_SUFFIX "]"
+ #endif
+ 
+ #endif /* !COMPILER */