diff --git a/net-im/matrix-commander/Manifest b/net-im/matrix-commander/Manifest
index 0a89f89..1d48291 100644
--- a/net-im/matrix-commander/Manifest
+++ b/net-im/matrix-commander/Manifest
@@ -1 +1,2 @@
 DIST matrix-commander-0.0.0_pre20210806.tar.gz 735964 BLAKE2B f3f4c495823767778db99b65bb5aa88f45ea4009004b0c3825bd476a3a1d5c9e569aa18dfcc3408614357fbd2ba6931ec91fbea9f2efba488d83f812ba857d6a SHA512 0d32a3315978c6c373df5e1a7660516cd2c12ce9802f007a2299c99891b628b23159dbe511159aa5631d3b3717851230bd97eab12050f59a7735431246d55d54
+DIST matrix-commander-3.0.1.gh.tar.gz 1772532 BLAKE2B 27e4f6ece7c66d8b89a4793019c5fba405e67b5df707807a12cb796f08f58d71ceecd32eb60620c403e8c72bc4e3b1f9e6cfd5a43aa3af643746e5d70204234c SHA512 c68c053dfd52eaf8e1ee13c14a805992021d5cf9c00403aefafd03cb8fac8d2fbc43684671765038088acb34a0d08c316adece9ed05b90f7935d49933d0d637a
diff --git a/net-im/matrix-commander/matrix-commander-3.0.1.ebuild b/net-im/matrix-commander/matrix-commander-3.0.1.ebuild
new file mode 100644
index 0000000..b5fe7a1
--- /dev/null
+++ b/net-im/matrix-commander/matrix-commander-3.0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit distutils-r1 bash-completion-r1
+
+DESCRIPTION="Simple but convenient CLI-based Matrix client app for sending and receiving"
+HOMEPAGE="https://github.com/8go/matrix-commander"
+SRC_URI="https://github.com/8go/matrix-commander/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Tests are a bunch shell scripts and lone python script
+# Not gonna bother
+RESTRICT="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/aiofiles-0.6.0[${PYTHON_USEDEP}]
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
+		>=dev-python/matrix-nio-0.14.1[e2e(+),${PYTHON_USEDEP}]
+		dev-python/notify2[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/python-magic[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+	')
+"
+
+src_install() {
+	distutils-r1_src_install
+
+	dobashcomp auto-completion/bash/matrix-commander.bash
+}
diff --git a/net-im/matrix-commander/metadata.xml b/net-im/matrix-commander/metadata.xml
index 84841ab..b7e9b8a 100644
--- a/net-im/matrix-commander/metadata.xml
+++ b/net-im/matrix-commander/metadata.xml
@@ -3,5 +3,6 @@
 <pkgmetadata>
   <upstream>
     <remote-id type="github">8go/matrix-commander</remote-id>
+    <remote-id type="pypi">matrix-commander</remote-id>
   </upstream>
 </pkgmetadata>