diff --git a/mingw-w64-python-virtualenv/virtualenv3-i686.install b/mingw-w64-python-virtualenv/virtualenv3-i686.install
deleted file mode 100644
index 2a262ccb4f..0000000000
--- a/mingw-w64-python-virtualenv/virtualenv3-i686.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  cd mingw32
-  local _prefix=$(pwd -W)
-  cd -
-  local _it
-  for _it in virtualenv; do
-    sed -e "s|/mingw32|${_prefix}|g" \
-        -i ${_prefix}/bin/${_it}-script.py
-  done
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/mingw-w64-python-virtualenv/virtualenv3-x86_64.install b/mingw-w64-python-virtualenv/virtualenv3-x86_64.install
deleted file mode 100644
index c57a560c6c..0000000000
--- a/mingw-w64-python-virtualenv/virtualenv3-x86_64.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  cd mingw64
-  local _prefix=$(pwd -W)
-  cd -
-  local _it
-  for _it in virtualenv; do
-    sed -e "s|/mingw64|${_prefix}|g" \
-        -i ${_prefix}/bin/${_it}-script.py
-  done
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/mingw-w64-python-virtualenv/001-mingw-python-support.patch b/mingw-w64-python2-virtualenv/001-mingw-python-support.patch
similarity index 100%
rename from mingw-w64-python-virtualenv/001-mingw-python-support.patch
rename to mingw-w64-python2-virtualenv/001-mingw-python-support.patch
diff --git a/mingw-w64-python-virtualenv/PKGBUILD b/mingw-w64-python2-virtualenv/PKGBUILD
similarity index 57%
rename from mingw-w64-python-virtualenv/PKGBUILD
rename to mingw-w64-python2-virtualenv/PKGBUILD
index e9d5b746a1..35f5d9120e 100644
--- a/mingw-w64-python-virtualenv/PKGBUILD
+++ b/mingw-w64-python2-virtualenv/PKGBUILD
@@ -5,20 +5,17 @@
 
 _pyname=virtualenv
 _realname=${_pyname} #This should be lowercase
-pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}"  "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgbase=mingw-w64-python2-${_realname}
+pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}")
 pkgver=16.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Virtual Python Environment builder (mingw-w64)"
 arch=('any')
 url='https://virtualenv.pypa.io/'
 license=('MIT')
 makedepends=("${MINGW_PACKAGE_PREFIX}-python2"
-             "${MINGW_PACKAGE_PREFIX}-python3"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
              "${MINGW_PACKAGE_PREFIX}-python2-setuptools")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-pytest" "${MINGW_PACKAGE_PREFIX}-python3-mock"
-              "${MINGW_PACKAGE_PREFIX}-python2-pytest" "${MINGW_PACKAGE_PREFIX}-python2-mock")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python2-pytest" "${MINGW_PACKAGE_PREFIX}-python2-mock")
 options=('staticlibs' 'strip' '!debug')
 source=(${_realname}-${pkgver}.tar.gz::https://github.com/pypa/virtualenv/archive/${pkgver}.tar.gz
         001-mingw-python-support.patch)
@@ -30,55 +27,28 @@ prepare() {
   patch -p1 -i ${srcdir}/001-mingw-python-support.patch
   
   cd ${srcdir}
-  for builddir in python{2,3}-build-${CARCH}; do
-    rm -rf $builddir | true
-    cp -r "${_pyname}-${pkgver}" "${builddir}"
-  done
-}  
+  rm -rf "python2-build-${CARCH}" | true
+  cp -r "${_pyname}-${pkgver}" "python2-build-${CARCH}"
+}
   
 # Note that build() is sometimes skipped because it's done in 
 # the packages setup.py install for simplicity if you can do so.
 # but sometimes, you want to do a check before install which would
 # also trigger the build.  
 build() {
-  for pver in {2,3}; do  
-    msg "Python ${pver} build for ${CARCH}"
-    cd "${srcdir}/python${pver}-build-${CARCH}"
-    MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-      ${MINGW_PREFIX}/bin/python${pver} setup.py build
-  done  
-}
-
-#Uncomment when the prerequisits are finished.
-#check() {  
-#  for pver in {2,3}; do
-#    msg "Python ${pver} test for ${CARCH}"  
-#    cd "${srcdir}/python${pver}-build-${CARCH}"
-#    if [ $pver -eq 2 ]; then
-#      PYTHONPATH="$PWD"  ${MINGW_PREFIX}/bin/py.test2
-#    else
-#      PYTHONPATH="$PWD"  ${MINGW_PREFIX}/bin/py.test
-#    fi
-#  done  
-#}
-
-package_python3-virtualenv() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python3")
-
-  cd "${srcdir}/python3-build-${CARCH}"
+  msg "Python 2 build for ${CARCH}"
+  cd "${srcdir}/python2-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
-    --root="${pkgdir}" --optimize=1 --skip-build
-
-  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
-
-  local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX})
-  # fix python command in files
-  for _ff in ${pkgdir}${MINGW_PREFIX}/bin/*.py; do
-    sed -e "s|${_mingw_prefix}|${MINGW_PREFIX}|g" -i ${_ff}
-  done
+    ${MINGW_PREFIX}/bin/python2 setup.py build
 }
 
+#Uncomment when the prerequisites are finished.
+#check() {  
+#  msg "Python 2 test for ${CARCH}"
+#  cd "${srcdir}/python2-build-${CARCH}"
+#  PYTHONPATH="$PWD"  ${MINGW_PREFIX}/bin/py.test2
+#}
+
 package_python2-virtualenv() {
   depends=("${MINGW_PACKAGE_PREFIX}-python2")
 
@@ -110,17 +80,7 @@ package_mingw-w64-i686-python2-virtualenv() {
   package_python2-virtualenv
 }
 
-package_mingw-w64-i686-python3-virtualenv() {
-  install=${_realname}3-${CARCH}.install
-  package_python3-virtualenv
-}
-
 package_mingw-w64-x86_64-python2-virtualenv() {
   install=${_realname}2-${CARCH}.install
   package_python2-virtualenv
 }
-
-package_mingw-w64-x86_64-python3-virtualenv() {
-  install=${_realname}3-${CARCH}.install
-  package_python3-virtualenv
-}
diff --git a/mingw-w64-python-virtualenv/virtualenv2-i686.install b/mingw-w64-python2-virtualenv/virtualenv2-i686.install
similarity index 100%
rename from mingw-w64-python-virtualenv/virtualenv2-i686.install
rename to mingw-w64-python2-virtualenv/virtualenv2-i686.install
diff --git a/mingw-w64-python-virtualenv/virtualenv2-x86_64.install b/mingw-w64-python2-virtualenv/virtualenv2-x86_64.install
similarity index 100%
rename from mingw-w64-python-virtualenv/virtualenv2-x86_64.install
rename to mingw-w64-python2-virtualenv/virtualenv2-x86_64.install