diff --git a/net-libs/libosmocore/Manifest b/net-libs/libosmocore/Manifest
index ae3a4cb93..3fa538ae8 100644
--- a/net-libs/libosmocore/Manifest
+++ b/net-libs/libosmocore/Manifest
@@ -1,5 +1,2 @@
-DIST libosmocore-1.3.2.tar.gz 1287772 BLAKE2B 7cb70af46899135b91d268ae064eca2cb24a32d4ade62fb1d2a286c9e26ec77a673f755331ef789f5dde0b5238cf3e303edc026715030137e74b9a87c7f9d23e SHA512 c636f8966cec1353371a784c48e36baa63d8f0fdfadd2c88581e28ee534f681c6a0891d24a2bec0a6a814d82883d28fa31a823fa84ef827cc948b0cd71e929ae
-DIST libosmocore-1.4.0.tar.gz 1238779 BLAKE2B c0fe37d4cdfb28836f0a93a4f095674583c4faeba93764102dcabde59b2b28681aff21886a5be2b5aabea55823b9a8d040c2a90b7e825ec53bcdbe8d12b08c03 SHA512 4d8e632cabc3ee42c47065a69c0b32ca18139ac7b6ce9ba0812ddb79b05b569a77d8f707e6872a332a0f485f2b1ab0f60a39b8daa08dfd5a0e69fce36b7d4989
-DIST libosmocore-1.4.2.tar.gz 1240196 BLAKE2B 1eed6fd1d9d42d901f08d0a68642f76fe0722b73c7e8a5d660c96d6c303a08153b577f0a8f879ac24413ed9cd39c5dee153c2e1e182c9258d035faf263e8f83b SHA512 8820222d107dd6c93acc0993462db49b8b961667222556d6e99c21b1f16cc62da239c940a3443740e462539c5437f50e5464ccf321a9c33f10768e772dcd8cc9
-DIST libosmocore-1.5.1.tar.gz 1430604 BLAKE2B b4ba66ba6a5ca82cc6c99d38e1593ff8926065e41567bce08ba22aa5d16affeda8818cef7bb1dc14ebde72d393d59a62469de048e76365e024d2423eab8e18db SHA512 5bc90cc33adff07bed7f4df92565bfb3ca87447d7eef9e6be36a7ca7fb57917b141ee7aed658836ee89b87375f9914e955acd641e9de810599863b8777a44d64
 DIST libosmocore-1.6.0.tar.gz 1492230 BLAKE2B fa3ae74272def2d18253e34d6ec6de163b1a2bf9b98f23d225b6c45f025a5a96bde0cf6e9a6131e7af889f544e9b226dde293352ffae56d50748b95356c44493 SHA512 5a7bef310138e79d2f94191fe67f8b6bbe6470aaac4e063959464caddf137246a69c5e3213a1f79617cd1fe14d397e8183408367da949564c1efe4980ad4f08c
+DIST libosmocore-1.6.0_p20220508.tar.gz 1512064 BLAKE2B e843e186059b5885c8f0633ebc876c3fcd078178b829d50836d228529d7c366cf6b68866b4045d18beed8c4d88090c60140d86854ee61da068deae835a02c0ca SHA512 4751146b4d6a4e44d6473007807987ba2521e0c46a9d772bf6f92111a4d993d18d84e7a622af1e8c6ee5f904977b928491be4ea1a221a28880a5020cdd52136a
diff --git a/net-libs/libosmocore/libosmocore-1.3.2.ebuild b/net-libs/libosmocore/libosmocore-1.3.2.ebuild
deleted file mode 100644
index 5468d704d..000000000
--- a/net-libs/libosmocore/libosmocore-1.3.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
-HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-	KEYWORDS=""
-else
-#	SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2"
-	SRC_URI="https://github.com/osmocom/libosmocore/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2 LGPL-3"
-SLOT="0"
-IUSE="pcsc-lite"
-
-RDEPEND="net-misc/lksctp-tools
-	sys-libs/talloc
-	pcsc-lite? ( sys-apps/pcsc-lite )
-"
-
-DEPEND="${RDEPEND}
-	app-doc/doxygen
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.6.0-automake-1.13.patch" )
-
-src_prepare() {
-	default_src_prepare
-	# set correct version in pkgconfig files
-	sed -i "s/UNKNOWN/${PV}/" git-version-gen || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable pcsc-lite pcsc)
-}
diff --git a/net-libs/libosmocore/libosmocore-1.4.2.ebuild b/net-libs/libosmocore/libosmocore-1.4.2.ebuild
deleted file mode 100644
index 5468d704d..000000000
--- a/net-libs/libosmocore/libosmocore-1.4.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
-HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-	KEYWORDS=""
-else
-#	SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2"
-	SRC_URI="https://github.com/osmocom/libosmocore/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2 LGPL-3"
-SLOT="0"
-IUSE="pcsc-lite"
-
-RDEPEND="net-misc/lksctp-tools
-	sys-libs/talloc
-	pcsc-lite? ( sys-apps/pcsc-lite )
-"
-
-DEPEND="${RDEPEND}
-	app-doc/doxygen
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.6.0-automake-1.13.patch" )
-
-src_prepare() {
-	default_src_prepare
-	# set correct version in pkgconfig files
-	sed -i "s/UNKNOWN/${PV}/" git-version-gen || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable pcsc-lite pcsc)
-}
diff --git a/net-libs/libosmocore/libosmocore-1.5.1.ebuild b/net-libs/libosmocore/libosmocore-1.5.1.ebuild
deleted file mode 100644
index 5468d704d..000000000
--- a/net-libs/libosmocore/libosmocore-1.5.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Utility functions for OsmocomBB, OpenBSC and related projects"
-HOMEPAGE="http://bb.osmocom.org/trac/wiki/libosmocore"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-	KEYWORDS=""
-else
-#	SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2"
-	SRC_URI="https://github.com/osmocom/libosmocore/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2 LGPL-3"
-SLOT="0"
-IUSE="pcsc-lite"
-
-RDEPEND="net-misc/lksctp-tools
-	sys-libs/talloc
-	pcsc-lite? ( sys-apps/pcsc-lite )
-"
-
-DEPEND="${RDEPEND}
-	app-doc/doxygen
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.6.0-automake-1.13.patch" )
-
-src_prepare() {
-	default_src_prepare
-	# set correct version in pkgconfig files
-	sed -i "s/UNKNOWN/${PV}/" git-version-gen || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable pcsc-lite pcsc)
-}
diff --git a/net-libs/libosmocore/libosmocore-1.6.0.ebuild b/net-libs/libosmocore/libosmocore-1.6.0-r1.ebuild
similarity index 83%
rename from net-libs/libosmocore/libosmocore-1.6.0.ebuild
rename to net-libs/libosmocore/libosmocore-1.6.0-r1.ebuild
index ff661dcdf..b52e1b58e 100644
--- a/net-libs/libosmocore/libosmocore-1.6.0.ebuild
+++ b/net-libs/libosmocore/libosmocore-1.6.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -13,7 +13,6 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
 	KEYWORDS=""
 else
-#	SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2"
 	SRC_URI="https://github.com/osmocom/libosmocore/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
@@ -21,8 +20,11 @@ fi
 LICENSE="GPL-2 LGPL-3"
 SLOT="0"
 IUSE="pcsc-lite"
+RESTRICT="test"
 
 RDEPEND="virtual/libusb:1
+	net-libs/gnutls:=
+	net-libs/libmnl:=
 	net-misc/lksctp-tools
 	sys-libs/talloc
 	pcsc-lite? ( sys-apps/pcsc-lite )"
@@ -44,3 +46,8 @@ src_configure() {
 	econf \
 		$(use_enable pcsc-lite pcsc)
 }
+
+src_install() {
+	default
+	find "${D}" -xtype f -name '*.la' -delete || die
+}
diff --git a/net-libs/libosmocore/libosmocore-1.4.0.ebuild b/net-libs/libosmocore/libosmocore-1.6.0_p20220508.ebuild
similarity index 58%
rename from net-libs/libosmocore/libosmocore-1.4.0.ebuild
rename to net-libs/libosmocore/libosmocore-1.6.0_p20220508.ebuild
index 5468d704d..2d0d408b1 100644
--- a/net-libs/libosmocore/libosmocore-1.4.0.ebuild
+++ b/net-libs/libosmocore/libosmocore-1.6.0_p20220508.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -13,19 +13,24 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
 	KEYWORDS=""
 else
-#	SRC_URI="http://cgit.osmocom.org/cgit/libosmocore/snapshot/${P}.tar.bz2"
-	SRC_URI="https://github.com/osmocom/libosmocore/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	COMMIT="8f25fd27ed35d6cb47b5e57aea632d088b69bfe0"
+	SRC_URI="https://github.com/osmocom/libosmocore/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	#Tests fail, no keywords for you
+	#KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}/${PN}-${COMMIT}"
 fi
 
 LICENSE="GPL-2 LGPL-3"
 SLOT="0"
 IUSE="pcsc-lite"
+RESTRICT="test"
 
-RDEPEND="net-misc/lksctp-tools
+RDEPEND="virtual/libusb:1
+	net-libs/gnutls:=
+	net-libs/libmnl:=
+	net-misc/lksctp-tools
 	sys-libs/talloc
-	pcsc-lite? ( sys-apps/pcsc-lite )
-"
+	pcsc-lite? ( sys-apps/pcsc-lite )"
 
 DEPEND="${RDEPEND}
 	app-doc/doxygen
@@ -44,3 +49,8 @@ src_configure() {
 	econf \
 		$(use_enable pcsc-lite pcsc)
 }
+
+src_install() {
+	default
+	find "${D}" -xtype f -name '*.la' -delete || die
+}