diff --git a/weechat-matrix/.footprint b/weechat-matrix/.footprint
index 4557155a5..8be9a0c9a 100644
--- a/weechat-matrix/.footprint
+++ b/weechat-matrix/.footprint
@@ -6,29 +6,28 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/python3.10/
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/matrix-0.3.0-py3.10.egg-info/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix-0.3.0-py3.10.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix-0.3.0-py3.10.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix-0.3.0-py3.10.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix-0.3.0-py3.10.egg-info/requires.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix-0.3.0-py3.10.egg-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/matrix-0.3.0.dist-info/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix-0.3.0.dist-info/LICENSE
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix-0.3.0.dist-info/METADATA
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix-0.3.0.dist-info/RECORD
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix-0.3.0.dist-info/WHEEL
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/matrix/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__init__.py (EMPTY)
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/__init__.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/_weechat.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/bar_items.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/buffer.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/colors.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/commands.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/completion.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/config.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/globals.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/message_renderer.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/server.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/uploads.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/utf.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/utils.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/__init__.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/_weechat.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/bar_items.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/buffer.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/colors.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/commands.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/completion.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/config.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/globals.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/message_renderer.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/server.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/uploads.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/utf.cpython-310.opt-2.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/__pycache__/utils.cpython-310.opt-2.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/_weechat.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/bar_items.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/matrix/buffer.py
diff --git a/weechat-matrix/.signature b/weechat-matrix/.signature
index d42924d3a..6806f0b87 100644
--- a/weechat-matrix/.signature
+++ b/weechat-matrix/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3xXI1CyF6L0LlfvjKEusMwOsLWo9cSZlOcuW46f3DL2UPNJQtlQhkGLKcrh63Cro+DaBkBk9uUvggwmFXIxQvQc=
-SHA256 (Pkgfile) = 7160f24e8e1b1706b1e5a49b0c71c7ae66819428552572e6f887535a8813d96e
-SHA256 (.footprint) = d863e1b5248c79ea9d6d3a4de4fe5c25f55f4648ff2e90aee03dfc26780542b1
+RWSagIOpLGJF30USSLaI+IX3eVmDLtzpQdi0m+vtJuTpprDrF4jPogfNs6Jmcq11X779BQXQThEoPcSiM9IS30IDvYoT+0GIAwQ=
+SHA256 (Pkgfile) = 0d3c9d9b25fafd65c28e817b73a4cd9d811678fa2a191125e4b748df9cb58397
+SHA256 (.footprint) = 9a4661216b1a33bd445cea0eedce417acc1ddfb76e4e40f029c35de3156017a8
 SHA256 (weechat-matrix-0.3.0.tar.gz) = 4a7942ec976dc6081ebb689cb0dc0f02f8ab9d24121f98c6dcb7f39478251329
+SHA256 (0001-Switch-to-correct-build-system-definition.patch) = a9a6b78529445931c283b764805960ca92a05b9665b6067f1c6c2678e0d58dbe
diff --git a/weechat-matrix/0001-Switch-to-correct-build-system-definition.patch b/weechat-matrix/0001-Switch-to-correct-build-system-definition.patch
new file mode 100644
index 000000000..f2402f805
--- /dev/null
+++ b/weechat-matrix/0001-Switch-to-correct-build-system-definition.patch
@@ -0,0 +1,27 @@
+From b05b004192f9922c90a4399bee5c1cacc5a48b67 Mon Sep 17 00:00:00 2001
+From: David Runge <dave@sleepmap.de>
+Date: Mon, 9 Jan 2023 19:50:39 +0100
+Subject: [PATCH] Switch to correct build-system definition
+
+pyproject.toml:
+Use the correct PEP517 build-backend, as defined by poetry upstream
+(https://python-poetry.org/docs/pyproject#poetry-and-pep-517).
+---
+ pyproject.toml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 709adf1..d3292af 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -31,5 +31,5 @@ matrix_sso_helper = ["aiohttp"]
+ matrix_upload = ["python-magic", "requests"]
+ 
+ [build-system]
+-requires = ["poetry>=0.12"]
+-build-backend = "poetry.masonry.api"
++requires = ["poetry-core>=1.0.0"]
++build-backend = "poetry.core.masonry.api"
+-- 
+2.39.0
+
diff --git a/weechat-matrix/Pkgfile b/weechat-matrix/Pkgfile
index 8c1f7c374..7ca72a4f1 100644
--- a/weechat-matrix/Pkgfile
+++ b/weechat-matrix/Pkgfile
@@ -6,15 +6,17 @@
 name=weechat-matrix
 version=0.3.0
 release=1
-source=(https://github.com/poljar/weechat-matrix/archive/$version/$name-$version.tar.gz)
+source=(https://github.com/poljar/weechat-matrix/archive/$version/$name-$version.tar.gz
+  0001-Switch-to-correct-build-system-definition.patch)
 
 build() {
   cd $name-$version
-  dephell deps convert --from pyproject.toml --to setup.py
-  /usr/bin/python3 setup.py build
-  /usr/bin/python3 setup.py install --prefix=/usr \
-    --root=$PKG \
-    --skip-build
+
+  patch -Np1 -i $SRC/0001-Switch-to-correct-build-system-definition.patch
+
+  /usr/bin/python3 -m build --wheel --skip-dependency-check --no-isolation
+  /usr/bin/python3 -m installer --compile-bytecode 2 --destdir=$PKG dist/*.whl
+
   install -Dm755 main.py $PKG/usr/share/weechat/python/weechat-matrix.py
   for _script in matrix_decrypt matrix_sso_helper matrix_upload
   do