diff --git a/mingw-w64-wxPython/001-mingw-python.patch b/mingw-w64-wxPython/001-mingw-python.patch
index cdeacc4312..d6b5958373 100644
--- a/mingw-w64-wxPython/001-mingw-python.patch
+++ b/mingw-w64-wxPython/001-mingw-python.patch
@@ -26,6 +26,15 @@
      value = os.popen(cmd, 'r').read()[:-1]
      return value
  
+@@ -511,7 +511,7 @@
+         distutils.command.install_headers.install_headers.finalize_options(self)
+ 
+     def run(self):
+-        if os.name == 'nt':
++        if os.name == 'nt' and not "MSYSTEM" in os.environ:
+             return
+         headers = self.distribution.headers
+         if not headers:
 @@ -602,7 +602,7 @@
  def findLib(name, libdirs):
      name = makeLibName(name)[0]
diff --git a/mingw-w64-wxPython/PKGBUILD b/mingw-w64-wxPython/PKGBUILD
index 5c7f0cbeec..9fd639896e 100644
--- a/mingw-w64-wxPython/PKGBUILD
+++ b/mingw-w64-wxPython/PKGBUILD
@@ -4,7 +4,7 @@ _realname=wxPython
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.0.1.1
 _editraver=0.7.20
-pkgrel=1
+pkgrel=2
 pkgdesc="A wxWidgets GUI toolkit for Python (mingw-w64)"
 arch=('any')
 license=("custom:wxWindows")
@@ -20,7 +20,7 @@ source=(http://downloads.sourceforge.net/wxpython/${_realname}-src-${pkgver}.tar
         002-system-includes.patch
         003-fix-cast-error.patch)
 sha1sums=('d2c4719015d7c499a9765b1e5107fdf37a32abfb'
-          '5ed416e6ca1665e64d0b374d065042a02be43150'
+          'b189dac25d4354ba3cca93e6108fb279dea0e2b7'
           'fb96353201fb0b529a71e70710986246b2978e94'
           '9fa4ac1988fec999feca090f8a8360807664f987')
 
@@ -60,11 +60,7 @@ build() {
     --enable-accessibility \
     --disable-precomp-headers
 
-  echo "Package dir is ${pkgdir}; PREFIX is ${MINGW_PREFIX}"
   cd wxPython
-  #CPPFLAGS+=" $(${MINGW_PREFIX}/bin/wx-config --cppflags)"
-  #CFLAGS+=" $(${MINGW_PREFIX}/bin/wx-config --cflags)"
-  #CXXFLAGS+=" $(${MINGW_PREFIX}/bin/wx-config --cxxflags)"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python2 setup.py WXPORT=msw BUILD_ACTIVEX=0 UNICODE=1 COMPILER=mingw32 build
   #make VERBOSE=1
@@ -72,10 +68,19 @@ build() {
 
 package() {
   cd "${srcdir}/wxPython-src-${pkgver}/wxPython"
-  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python2 setup.py WXPORT=msw BUILD_ACTIVEX=0 UNICODE=1 COMPILER=mingw32 install --prefix=${MINGW_PREFIX} --root="$pkgdir"
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=;--install-headers=;-install-data=" \
+  ${MINGW_PREFIX}/bin/python2 setup.py NO_HEADERS=0 WXPORT=msw BUILD_ACTIVEX=0 UNICODE=1 COMPILER=mingw32 INSTALL_MULTIVERSION=0 \
+    install --prefix=${MINGW_PREFIX} --root="$pkgdir"
+  
   install -D -m644 ../docs/licence.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
   
+  pushd ${MINGW_PREFIX} > /dev/null
+  local _dir=`pwd -W`
+  popd > /dev/null
+  for _f in ${pkgdir}${MINGW_PREFIX}/bin/*; do
+    sed -e "s|${_dir}|${MINGW_PREFIX}|g" -i ${_f}
+  done
+  
   #cd "${srcdir}/Editra-${_editraver}"
   #MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   #${MINGW_PREFIX}/bin/python2 setup.py install --root="${pkgdir}" --prefix=${MINGW_PREFIX}