diff --git a/extra/python-debugpy/.SRCINFO b/extra/python-debugpy/.SRCINFO
index 265359562..fd5087b31 100644
--- a/extra/python-debugpy/.SRCINFO
+++ b/extra/python-debugpy/.SRCINFO
@@ -1,15 +1,20 @@
 pkgbase = python-debugpy
 	pkgdesc = An implementation of the Debug Adapter Protocol for Python
 	pkgver = 1.8.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://aka.ms/debugpy
 	arch = x86_64
 	license = MIT
+	makedepends = cython
+	makedepends = git
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = python-setuptools
+	makedepends = python-wheel
 	depends = gcc-libs
 	depends = glibc
 	depends = python
-	source = https://github.com/microsoft/debugpy/archive/v1.8.1/python-debugpy-1.8.1.tar.gz
-	sha256sums = ef3b939b63cf2898f36e1f43cd3d9ec5dc9b3305c024836f8201a932fe16fd4e
+	source = git+https://github.com/microsoft/debugpy#tag=v1.8.1
+	sha256sums = 41cd4bf27887e8bd431555c9107f55f61fd359cb794a0867b615cb1cc284dd0d
 
 pkgname = python-debugpy
diff --git a/extra/python-debugpy/PKGBUILD b/extra/python-debugpy/PKGBUILD
index e94951d96..8bf1c1b34 100644
--- a/extra/python-debugpy/PKGBUILD
+++ b/extra/python-debugpy/PKGBUILD
@@ -2,12 +2,12 @@
 # Contributor: mark.blakeney at bullet-systems dot net
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
-#  - comment out extra compile, x86 and doesn't appear to be necessary for ARM
+#  - comment out extra compile and install, x86 and doesn't appear to be necessary for ARM
 
 _pipname=debugpy
 pkgname=python-$_pipname
 pkgver=1.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc='An implementation of the Debug Adapter Protocol for Python'
 arch=(x86_64)
 url='https://aka.ms/debugpy'
@@ -15,9 +15,14 @@ license=(MIT)
 depends=(gcc-libs
          glibc
          python)
-makedepends=(python-setuptools)
-source=(https://github.com/microsoft/debugpy/archive/v$pkgver/$pkgname-$pkgver.tar.gz)
-sha256sums=('ef3b939b63cf2898f36e1f43cd3d9ec5dc9b3305c024836f8201a932fe16fd4e')
+makedepends=(cython
+             git
+             python-build
+             python-installer
+             python-setuptools
+             python-wheel)
+source=(git+https://github.com/microsoft/debugpy#tag=v$pkgver)
+sha256sums=('41cd4bf27887e8bd431555c9107f55f61fd359cb794a0867b615cb1cc284dd0d')
 
 prepare() {
   cd $_pipname-$pkgver
@@ -26,16 +31,22 @@ prepare() {
 }
 
 build() {
-  cd $_pipname-$pkgver
-  python setup.py build
+  cd $_pipname
+# Recythonize sources
+  pushd src/debugpy/_vendored/pydevd/_pydevd_bundle
+    cythonize pydevd_cython.pyx
+  popd
+
+  python -m build --wheel --no-isolation
 # Compile attach libraries
   #cd build/lib*/debugpy/_vendored/pydevd/pydevd_attach_to_process
   #g++ ${CXXFLAGS} -m64 -shared -o attach_linux_amd64.so -fPIC -nostartfiles linux_and_mac/attach.cpp ${LDFLAGS}
 }
 
 package() {
-  cd $_pipname-$pkgver
-  python setup.py install --skip-build --root="$pkgdir" --optimize=1
-
+  cd $_pipname
+  python -m installer --destdir="$pkgdir" dist/*.whl
+  #install -Dm755 build/lib*/debugpy/_vendored/pydevd/pydevd_attach_to_process/attach_linux_amd64.so \
+  #  -t "$pkgdir"`python -c "import site; print(site.getsitepackages()[0])"`/debugpy/_vendored/pydevd/pydevd_attach_to_process
   install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }