diff --git a/net-im/dendrite/Manifest b/net-im/dendrite/Manifest
index 3a62691..2c7d8d4 100644
--- a/net-im/dendrite/Manifest
+++ b/net-im/dendrite/Manifest
@@ -1,2 +1,4 @@
 DIST dendrite-0.12.0-deps.tar.xz 520137316 BLAKE2B 2370aa0a47046db5863fd08827eb19ff8c8e060f67368f6c0241ffdc45d2b0cf7810dd1e67297e89f9b84e110e7fee30e95a355e7ef842138821ba8c197e2cb1 SHA512 20f8113c1d0d504f88674b80933f18e50d659fc5a87fe8485a5884d98c463a94f32271c15da1fe4d2c3106dc7747e4f29fd26f7993c03d669bddd5c0292437d2
 DIST dendrite-0.12.0.tar.gz 1086809 BLAKE2B ad3975458e27149851efc8aca769d719439a65d81c98f2b6545a70ab42a1455ec2831c876d1fd26a21e43605df0445a3dbb501ab7fd865f5b39103af9d710417 SHA512 1e2d65d33b684481394aebf9b11394ec7c9846b214eb1a38ff4cd4dec126192f902e8abc65fcdfa4c463ae156bac722169c19628edc69d57649af26f176ea6c6
+DIST dendrite-0.12.0_p20230524-deps.tar.xz 520943952 BLAKE2B e65fcd5e94b6c22d2e8c32a32aa0192ca2ea47069d7165e261bfeda592a6a81c122223502f72816e9df55613755e2b9188928511101319d4c0e24e3c9225b6cb SHA512 ffe1ed54e0cbc8be1a9e43c443129ec30d2f92620a26729d7c5dd9ce23e30ea461cec8aef82581aab1c1f43457c8a1ff6865eb64a6d21a7f4f26ec1af1d1ebba
+DIST dendrite-0.12.0_p20230524.tar.gz 1228443 BLAKE2B 8361ba4df11bf4a4eba003c3274ae59efc23d9106f4666d76d2224d7992df8111975acbe0dc2eab0d463f13d08730b551ff9b54eb77d5619009b34cb68041d8e SHA512 9909eaafd911d5df79dc7774430793915a75630c48d210fa21ae99a53e27f701baec78724ad61f2fa728f8bca26b1158ec57fd5abe60ae3772026eef9b6a59ee
diff --git a/net-im/dendrite/dendrite-0.12.0.ebuild b/net-im/dendrite/dendrite-0.12.0.ebuild
index c4ffe9d..5ca925d 100644
--- a/net-im/dendrite/dendrite-0.12.0.ebuild
+++ b/net-im/dendrite/dendrite-0.12.0.ebuild
@@ -4,7 +4,7 @@
 EAPI="8"
 EGO_PN="github.com/matrix-org/dendrite/"
 inherit go-module systemd
-COMMIT_ID=""
+COMMIT_ID="11b557097c6745309c09b58f681080d3fcc4f9f5"
 
 DESCRIPTION="Matrix homeserver written in go"
 HOMEPAGE="https://matrix.org https://github.com/matrix-org/dendrite"
diff --git a/net-im/dendrite/dendrite-0.12.0_p20230524.ebuild b/net-im/dendrite/dendrite-0.12.0_p20230524.ebuild
new file mode 100644
index 0000000..5ca925d
--- /dev/null
+++ b/net-im/dendrite/dendrite-0.12.0_p20230524.ebuild
@@ -0,0 +1,106 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+EGO_PN="github.com/matrix-org/dendrite/"
+inherit go-module systemd
+COMMIT_ID="11b557097c6745309c09b58f681080d3fcc4f9f5"
+
+DESCRIPTION="Matrix homeserver written in go"
+HOMEPAGE="https://matrix.org https://github.com/matrix-org/dendrite"
+
+if [[ ${PV} == *_p* ]]; then
+	SRC_URI="https://${EGO_PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT_ID}"
+else
+	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+# Add the manually vendored tarball.
+# Compress the tarball with: xz -9kT0 --memlimit-decompress=256M
+SRC_URI+=" https://files.holgersson.xyz/gentoo/distfiles/${P}-deps.tar.xz"
+
+KEYWORDS="~amd64"
+# There are some third-party licenses for test suites
+# like non-commercial clauses inside for ccgo / CompCert.
+# Restrict test execution until that stuff is sorted out.
+RESTRICT="test"
+
+LICENSE="
+	Apache-2.0
+	BSD
+	BSD-2
+	CC0-1.0
+	ISC
+	LGPL-3
+	MIT
+	MPL-2.0
+	Unlicense
+	ZLIB
+"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	acct-user/dendrite
+	acct-group/dendrite
+"
+BDEPEND=""
+
+src_unpack() {
+	go-module_src_unpack || die
+}
+
+src_compile() {
+	local mygobuildargs=(
+		-o bin/
+		-trimpath
+		-ldflags="-s -w"
+		-mod mod
+		-v -x
+		-work
+	)
+
+	ego build "${mygobuildargs[@]}" "${S}/cmd/..."
+}
+
+src_test() {
+	ego test -trimpath -v -x -work "${S}/cmd/..."
+}
+
+src_install() {
+	# Install files from bin, prefix with 'dendrite' if necessary.
+	newbin bin/create-account dendrite-create-account
+
+	dobin bin/dendrite-demo-pinecone
+	dobin bin/dendrite-demo-yggdrasil
+	dobin bin/dendrite
+	dobin bin/dendrite-upgrade-tests
+
+	# prefix
+	newbin bin/furl dendrite-furl
+	newbin bin/generate-config dendrite-generate-config
+	newbin bin/generate-keys dendrite-generate-keys
+	newbin bin/resolve-state dendrite-resolve-state
+
+	# Provide a sample configuration.
+	dodir "/etc/dendrite"
+	insinto /etc/dendrite
+	doins "${S}/dendrite-sample.yaml"
+
+	# Install init scripts for OpenRC
+	newinitd "${FILESDIR}"/dendrite.initd dendrite
+	newconfd "${FILESDIR}"/dendrite.confd dendrite
+
+	# Install a systemd unit.
+	systemd_newunit "${FILESDIR}"/dendrite.service dendrite.service
+
+	keepdir "/var/log/dendrite"
+	fowners dendrite:dendrite "/var/log/dendrite"
+}
+
+pkg_postinst() {
+	elog ""
+	elog "Note that all binaries are prefixed with 'dendrite-'"
+	elog "- even ones that have no prefix uptream."
+}