diff --git a/net-wireless/trunk-recorder/Manifest b/net-wireless/trunk-recorder/Manifest
index 0a688561c..62a0426e5 100644
--- a/net-wireless/trunk-recorder/Manifest
+++ b/net-wireless/trunk-recorder/Manifest
@@ -1 +1,2 @@
 DIST trunk-recorder-4.7.1.tar.gz 4391284 BLAKE2B 012a917eb8f01fea08fb176880ca0ed6169cbfb8bd0ead850fd472de170c409f84885489b2b5be3277c23425b0a50ae3a31fb0c71f2ebb6c941f88a33193360e SHA512 e513e221bf5fae9c1ce841ebd2a364e66fe7aa4796fa82639042c838d8c6c376106acddae3a25a1567d6f58f28abdb5888a93a1dda715d008444f1b983e15938
+DIST trunk-recorder-5.0.0.tar.gz 4706054 BLAKE2B 87c259fb0b08b51421b661aac7e070a5b74e386717470775312f5e364d85f19eda628df9af6f679445e5d72adf3744d32f7a6aa4d78adf57a1943a0e7d3cbc3c SHA512 30f5d3dac54175b365cd727f4c75e1a71ae75b30b4d5c9679a1da83ed52b3e2def9ffe79664adfa6b8b55345a695a715e7e81d22f4228d34df4cfe121cc9119f
diff --git a/net-wireless/trunk-recorder/trunk-recorder-5.0.0.ebuild b/net-wireless/trunk-recorder/trunk-recorder-5.0.0.ebuild
new file mode 100644
index 000000000..052a6482f
--- /dev/null
+++ b/net-wireless/trunk-recorder/trunk-recorder-5.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Records calls from a Trunked Radio System (P25 & SmartNet)"
+HOMEPAGE="https://github.com/robotastic/trunk-recorder"
+
+if [[ "${PV}" == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/robotastic/trunk-recorder.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	RESTRICT="strip"
+else
+	SRC_URI="https://github.com/robotastic/trunk-recorder/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	dev-libs/libfmt:=
+	dev-libs/spdlog:=
+	dev-libs/boost:=
+	net-misc/curl
+	net-wireless/gnuradio:=[uhd]
+	net-wireless/gr-osmosdr:=
+	net-wireless/uhd:=
+	!net-wireless/op25
+	sci-libs/volk:=
+	"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	cmake_src_install
+	# https://github.com/robotastic/trunk-recorder/issues/722
+	rm "${ED}/usr/include/${PN}/git.h" || die
+	cp git.h "${ED}/usr/include/${PN}/git.h" || die
+	cp "${BUILD_DIR}/libgit.so" "${ED}/usr/lib/trunk-recorder/libgit.so" || die
+}
diff --git a/net-wireless/trunk-recorder/trunk-recorder-9999.ebuild b/net-wireless/trunk-recorder/trunk-recorder-9999.ebuild
index b4afe90b1..052a6482f 100644
--- a/net-wireless/trunk-recorder/trunk-recorder-9999.ebuild
+++ b/net-wireless/trunk-recorder/trunk-recorder-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/robotastic/trunk-recorder"
 
 if [[ "${PV}" == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/robotastic/trunk-recorder.git"
-	EGIT_BRANCH="rc/v5.0"
+	EGIT_BRANCH="master"
 	inherit git-r3
 	RESTRICT="strip"
 else
@@ -34,13 +34,6 @@ DEPEND="
 	"
 RDEPEND="${DEPEND}"
 
-#-D_GLIBCXX_ASSERTIONS reveals the issue but the code is broken and this only hides it
-#https://github.com/robotastic/trunk-recorder/issues/780
-#https://github.com/robotastic/trunk-recorder/issues/783
-#https://github.com/robotastic/trunk-recorder/issues/894
-#https://github.com/robotastic/trunk-recorder/issues/895
-#append-cxxflags -U_GLIBCXX_ASSERTIONS
-
 src_install() {
 	cmake_src_install
 	# https://github.com/robotastic/trunk-recorder/issues/722