diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 0c1aa89..0188b01 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -9,13 +9,15 @@ arch=(x86_64)
 url="https://nodejs.org/"
 license=(MIT)
 depends=(openssl zlib icu libuv c-ares brotli libnghttp2) # http-parser
-makedepends=(python2 procps-ng)
+makedepends=(python procps-ng)
 optdepends=('npm: nodejs package manager')
 provides=("nodejs=$pkgver")
 conflicts=(nodejs)
-source=("${url}/dist/v${pkgver}/node-v${pkgver}.tar.xz")
+source=("${url}/dist/v${pkgver}/node-v${pkgver}.tar.xz"
+        python3.patch)
 # https://nodejs.org/download/release/latest-erbium/SHASUMS256.txt.asc
-sha256sums=(052f37ace6f569b513b5a1154b2a45d3c4d8b07d7d7c807b79f1566db61e979d)
+sha256sums=('052f37ace6f569b513b5a1154b2a45d3c4d8b07d7d7c807b79f1566db61e979d'
+            '20a0f718c94a4686dfc66edd994788759cbda65734cbc52082884f6d0913477d')
 validpgpkeys=(C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8  # Myles Borins <mylesborins@google.com>
               77984A986EBC2AA786BC0F66B01FBB92821C587A  # Gibson Fahnestock <gibfahn@gmail.com>
               B9AE9905FFD7803F25714661B63B535A4C206CA9  # Evan Lucas <evanlucas@me.com>
@@ -26,22 +28,12 @@ validpgpkeys=(C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8  # Myles Borins <mylesbor
 
 prepare() {
   cd node-v${pkgver}
-  echo 'Fixing for python2 name'
-  find -type f -exec sed \
-    -e 's_^#!/usr/bin/env python$_&2_' \
-    -e 's_^\(#!/usr/bin/python2\).[45]$_\1_' \
-    -e 's_^#!/usr/bin/python$_&2_' \
-    -e 's_^\( *exec \+\)python\( \+.*\)$_\1python2\2_'\
-    -e 's_^\(.*\)python\( \+-c \+.*\)$_\1python2\2_'\
-    -e "s_'python'_'python2'_" -i {} +
-  find test/ -type f -exec sed 's_python _python2 _' -i {} +
-  sed -i 's_ch.spawn(python,_ch.spawn(python2,_g' test/parallel/test-child-process-set-blocking.js
+  patch -p1 -i ../python3.patch
 }
 
 build() {
   cd node-v${pkgver}
 
-  export PYTHON=python2
   ./configure \
     --prefix=/usr \
     --with-intl=system-icu \
diff --git a/trunk/python3.patch b/trunk/python3.patch
new file mode 100644
index 0000000..d6ec0cf
--- /dev/null
+++ b/trunk/python3.patch
@@ -0,0 +1,58 @@
+diff --git a/configure b/configure
+index 9156e13f..630ef657 100755
+--- a/configure
++++ b/configure
+@@ -1,28 +1,37 @@
+ #!/bin/sh
+ 
+-# Locate python2 interpreter and re-execute the script.  Note that the
+-# mix of single and double quotes is intentional, as is the fact that
+-# the ] goes on a new line.
++# Locate an acceptable python interpreter and then re-execute the script.
++# Note that the mix of single and double quotes is intentional,
++# as is the fact that the ] goes on a new line.
++# When a 'which' call is made for a specific version of Python on Travis CI,
++# pyenv will alert which shims are available and then will fail the build.
+ _=[ 'exec' '/bin/sh' '-c' '''
++test ${TRAVIS} && exec python "$0" "$@"  # workaround for pyenv on Travis CI
++which python3.9 >/dev/null && exec python3.9 "$0" "$@"
++which python3.8 >/dev/null && exec python3.8 "$0" "$@"
++which python3.7 >/dev/null && exec python3.7 "$0" "$@"
++which python3.6 >/dev/null && exec python3.6 "$0" "$@"
++which python3.5 >/dev/null && exec python3.5 "$0" "$@"
++which python3 >/dev/null && exec python3 "$0" "$@"
+ which python2.7 >/dev/null && exec python2.7 "$0" "$@"
+-which python2 >/dev/null && exec python2 "$0" "$@"
+ exec python "$0" "$@"
+ ''' "$0" "$@"
+ ]
+ del _
+ 
+ import sys
+-from distutils.spawn import find_executable as which
+-if sys.version_info[:2] != (2, 7):
+-  sys.stderr.write('Please use Python 2.7')
++from distutils.spawn import find_executable
+ 
+-  python2 = which('python2') or which('python2.7')
+-
+-  if python2:
+-    sys.stderr.write(':\n\n')
+-    sys.stderr.write('  ' + python2 + ' ' + ' '.join(sys.argv))
+-
+-  sys.stderr.write('\n')
++print('Node configure: Found Python {0}.{1}.{2}...'.format(*sys.version_info))
++acceptable_pythons = ((3, 9), (3, 8), (3, 7), (3, 6), (3, 5), (2, 7))
++if sys.version_info[:2] in acceptable_pythons:
++  import configure
++else:
++  python_cmds = ['python{0}.{1}'.format(*vers) for vers in acceptable_pythons]
++  sys.stderr.write('Please use {0}.\n'.format(' or '.join(python_cmds)))
++  for python_cmd in python_cmds:
++      python_cmd_path = find_executable(python_cmd)
++      if python_cmd_path and 'pyenv/shims' not in python_cmd_path:
++        sys.stderr.write('\t{0} {1}\n'.format(python_cmd_path,
++                                              ' '.join(sys.argv[:1])))
+   sys.exit(1)
+-
+-import configure