diff --git a/net-wireless/srsran/Manifest b/net-wireless/srsran/Manifest
index 295d71952..30a597ecf 100644
--- a/net-wireless/srsran/Manifest
+++ b/net-wireless/srsran/Manifest
@@ -1 +1,2 @@
 DIST srsran-21.10.tar.gz 14603401 BLAKE2B 856889140cd2310f462491aab33c3f400206b7aaf4bc0acb18ab4ba72eae654bcbbf93ae4427a21723e89b50690f4c89a5c00fc3e4a69b28fbe3dad2fe77b5c4 SHA512 f8d52a507dc0d6b18222c55e576fcdf0d1ceb911d8f940bd9f6b3947ea0cf7dfb1146f71171171e3abbcc3a88fd49e636372e09e96a1e45e44d88c63014dc300
+DIST srsran-22.04.tar.gz 15172002 BLAKE2B 775f69c22888a58c77bd8710c8327601d5716e3d6e96b6664837e5ef78d2f0ae0d4e2dbf449b3a21ef232aea0fdc940f60024c7e5a30f4beaa3c852f89969b42 SHA512 3446421d4965705aa08044d283cf980a86ed2804f8e71268084d3667cd78048024400fe18beeb627b1fcd66ec86c8182d5467e57fa78d30f8d44b47f5d327040
diff --git a/net-wireless/srsran/srsran-22.04.ebuild b/net-wireless/srsran/srsran-22.04.ebuild
new file mode 100644
index 000000000..fd1499599
--- /dev/null
+++ b/net-wireless/srsran/srsran-22.04.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Open source SDR 4G/5G software suite from Software Radio Systems"
+HOMEPAGE="https://srs.io"
+
+# Possible issues to look into
+#https://bugs.gentoo.org/713684
+#https://bugs.gentoo.org/731720
+#https://bugs.gentoo.org/733662
+#https://bugs.gentoo.org/832618
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/srsran/srsRAN.git"
+else
+	inherit vcs-snapshot
+	KEYWORDS="~amd64 ~x86"
+	MY_PV=${PV//./_}
+	SRC_URI="https://github.com/srsran/srsRAN/archive/refs/tags/release_${MY_PV}.tar.gz -> ${P}.tar.gz"
+fi
+#https://github.com/srsran/srsRAN/issues/834
+#https://github.com/srsran/srsRAN/issues/835
+RESTRICT="test"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bladerf simcard soapysdr test uhd zeromq"
+
+DEPEND="
+	dev-libs/boost:=
+	dev-libs/elfutils
+	dev-libs/libconfig:=[cxx]
+	net-misc/lksctp-tools
+	net-libs/mbedtls:=
+	sci-libs/fftw:3.0=
+	bladerf? ( net-wireless/bladerf:= )
+	simcard? ( sys-apps/pcsc-lite )
+	soapysdr? ( net-wireless/soapysdr:= )
+	uhd? ( net-wireless/uhd:= )
+	zeromq? ( net-libs/zeromq:= )
+"
+RDEPEND="${DEPEND}
+		!net-wireless/srslte"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	sed -i '/ -Werror"/d' CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	#This may be a bad idea, and it is a bad idea for sure when other tests are failing
+	#-DENABLE_ALL_TEST="$(usex test)"
+	#-DENABLE_TTCN3="$(usex test)"
+	#Maybe make this one depend on zmq instead?
+	#-DENABLE_ZMQ_TEST="$(usex test)"
+
+	# Add missing srsGUI
+	#-DENABLE_GUI="$(usex gui)"
+	mycmakeargs=(
+		-DENABLE_UHD="$(usex uhd)"
+		-DENABLE_BLADERF="$(usex bladerf)"
+		-DENABLE_SOAPYSDR="$(usex soapysdr)"
+		-DENABLE_ZEROMQ="$(usex zeromq)"
+		-DENABLE_HARDSIM="$(usex simcard)"
+	)
+	cmake_src_configure
+}
diff --git a/net-wireless/srsran/srsran-9999.ebuild b/net-wireless/srsran/srsran-9999.ebuild
index cbb82e568..fd1499599 100644
--- a/net-wireless/srsran/srsran-9999.ebuild
+++ b/net-wireless/srsran/srsran-9999.ebuild
@@ -33,6 +33,7 @@ IUSE="bladerf simcard soapysdr test uhd zeromq"
 
 DEPEND="
 	dev-libs/boost:=
+	dev-libs/elfutils
 	dev-libs/libconfig:=[cxx]
 	net-misc/lksctp-tools
 	net-libs/mbedtls:=
diff --git a/profiles/pentoo/base/package.use.mask b/profiles/pentoo/base/package.use.mask
index 13825edbd..4c504d97b 100644
--- a/profiles/pentoo/base/package.use.mask
+++ b/profiles/pentoo/base/package.use.mask
@@ -72,4 +72,5 @@ net-analyzer/wireshark lto
 dev-libs/pocl accel
 
 #https://github.com/srsran/srsRAN/issues/835
+#https://github.com/srsran/srsRAN/issues/852
 net-wireless/srsran bladerf soapysdr uhd zeromq