diff --git a/net-wireless/srsran2/srsran2-20231020.ebuild b/net-wireless/srsran2/srsran2-20231020.ebuild
index 44a7bad6b..afe49544c 100644
--- a/net-wireless/srsran2/srsran2-20231020.ebuild
+++ b/net-wireless/srsran2/srsran2-20231020.ebuild
@@ -14,16 +14,17 @@ HOMEPAGE="https://github.com/hdtuanss/srsRAN2"
 #https://bugs.gentoo.org/733662
 #https://bugs.gentoo.org/832618
 
-KEYWORDS="~amd64 ~x86"
 HASH_COMMIT="4809688a2d645d5b506343c424d8ae39a01d3e3a"
 SRC_URI="https://github.com/hdtuanss/srsRAN2/archive/${HASH_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
-
-RESTRICT="!test? ( test )"
+S="${WORKDIR}/srsRAN2-${HASH_COMMIT}"
 
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="bladerf cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_fma3 cpu_flags_x86_sse simcard soapysdr test uhd zeromq"
 
+RESTRICT="!test? ( test )"
+
 #Add cpu_flags_x86_avx2= after fixing whatever build failure
 DEPEND="
 	dev-libs/boost:=
@@ -41,8 +42,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/srsRAN2-${HASH_COMMIT}"
-
 src_prepare() {
 	eapply "${FILESDIR}"/srsran2_array.patch
 	eapply "${FILESDIR}"/srsran2_asn1_lib.patch
diff --git a/net-wireless/srsran2/srsran2-20240929.ebuild b/net-wireless/srsran2/srsran2-20240929.ebuild
index 9254da6a7..43ca5e9c7 100644
--- a/net-wireless/srsran2/srsran2-20240929.ebuild
+++ b/net-wireless/srsran2/srsran2-20240929.ebuild
@@ -14,16 +14,17 @@ HOMEPAGE="https://github.com/hdtuanss/srsRAN2"
 #https://bugs.gentoo.org/733662
 #https://bugs.gentoo.org/832618
 
-KEYWORDS="~amd64 ~x86"
 HASH_COMMIT="0acc79d3fe5b153a18b62e8ef5af1a0fb2327a18"
 SRC_URI="https://github.com/hdtuanss/srsRAN2/archive/${HASH_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
-
-RESTRICT="!test? ( test )"
+S="${WORKDIR}/srsRAN2-${HASH_COMMIT}"
 
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="bladerf cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_fma3 cpu_flags_x86_sse simcard soapysdr test uhd zeromq"
 
+RESTRICT="!test? ( test )"
+
 #Add cpu_flags_x86_avx2= after fixing whatever build failure
 DEPEND="
 	dev-libs/boost:=
@@ -41,8 +42,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/srsRAN2-${HASH_COMMIT}"
-
 src_prepare() {
 	eapply "${FILESDIR}"/srsran2_array.patch
 	eapply "${FILESDIR}"/srsran2_asn1_lib.patch
@@ -57,6 +56,7 @@ src_prepare() {
 		-e 's/set(CMAKE_C_FLAGS/set(CMAKE_C_FLAGS_NERF/g' \
 		CMakeLists.txt
 	cmake_src_prepare
+
 }
 
 src_configure() {
@@ -104,7 +104,12 @@ src_configure() {
 	cmake_src_configure
 }
 
-#FIXME:
-# also, install the following include files:
-#/usr/include/srsenb
-#/usr/include/srsue
+src_install() {
+	cmake_src_install
+
+	for my_include in srsenb srsepc srsue
+	do
+		insinto "usr/include/srsran/${my_include}"
+		doins -r "${S}/${my_include}/hdr"/*
+	done
+}