diff --git a/net-im/matrix-commander/Manifest b/net-im/matrix-commander/Manifest
index 9a2d4e6..f2942ce 100644
--- a/net-im/matrix-commander/Manifest
+++ b/net-im/matrix-commander/Manifest
@@ -1,3 +1,4 @@
 DIST matrix-commander-7.7.0.gh.tar.gz 1847818 BLAKE2B 9965f6f13ffa2047ea6acfe736356f483651fb3ae7d9a0c966085b744425bbe575a8b000e18e28cf2de4bb03854829513641dad5989038f383cffa888591b56d SHA512 a899ebd8105092a71a556c20a80f978ee46459c45c31bb2b7f2b3bede225affc6d40438ae7d3db13c618b17da1785b4332e1777f282b93c6e3273a3227b8e474
 DIST matrix-commander-7.7.1.gh.tar.gz 1847850 BLAKE2B 5253b2d0cace78b68ba11f41e6263afa107e7a37d79047894f43c1deb9dee7951b7d6c180f078923112f9cc7363c914cda4ec53008cc6cd52b4463ff91e2b064 SHA512 b3b86675de9966a7a9d5ad0efb19a255a5508d2932784a906b75a1cf9fc49b49551612eb1c014b38159598b0d8e4ffa841be82ecd00df363da75b6e535ebae5f
 DIST matrix-commander-8.0.0.gh.tar.gz 1847884 BLAKE2B f72adc52d5cf4be74e1eabd612a093fbba430a441567b92573f363b81ffc6745c4236db3aa52882bb7b8e9681d12b1b769cdf33d7357e5f7086783c085f39c50 SHA512 2381d4e2160a656b0372f9b386d5626cdf5728253efcfe04473b5df22cfdaf7988f7d8cd61b9b8d65bff63c76354b636d2aea8877eab063d867aa2817d609f81
+DIST matrix-commander-8.0.4.gh.tar.gz 1848109 BLAKE2B d7532eb4644b7a2b5b3170f3bcefc82fb9760f5ccc49f9d42afd9f5f8ffb98c59a2b4b3a7820dd59c32b6fed7967ec3274dbeb3f3fddbe73887c79d4c7ae2217 SHA512 03736e0b78e8a3269506193be454c575911b7bb567ac44951676f14f264f56a489bf7d42b33460e9bf91eaa640468a345403de4b88a006fef77b8b3e43d5d92f
diff --git a/net-im/matrix-commander/matrix-commander-8.0.4.ebuild b/net-im/matrix-commander/matrix-commander-8.0.4.ebuild
new file mode 100644
index 0000000..a02d413
--- /dev/null
+++ b/net-im/matrix-commander/matrix-commander-8.0.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2023-2024 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_{10..13} )
+
+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 as they require testing against a running matrix server
+RESTRICT="test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/aiofiles-0.6.0[${PYTHON_USEDEP}]
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/async-timeout[${PYTHON_USEDEP}]
+		dev-python/emoji[${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_prepare() {
+	eapply_user
+
+	sed -i -e 's/matrix-commander.py/matrix-commander/' auto-completion/bash/matrix-commander.bash || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	newbashcomp auto-completion/bash/matrix-commander.bash matrix-commander
+}