diff --git a/net-wireless/kalibrate-hackrf/Manifest b/net-wireless/kalibrate-hackrf/Manifest
new file mode 100644
index 000000000..8c514cad5
--- /dev/null
+++ b/net-wireless/kalibrate-hackrf/Manifest
@@ -0,0 +1 @@
+DIST kalibrate-hackrf-20160604.tar.gz 21631 BLAKE2B 6ac20127d52cc3f9ed1cf6d6c7aecc948f296ce52f1ce0aa9fd79802d0f8bfb5d30399cf44c6381bddc39dc43ce1424bbbbdbba55132131226b07e61a7318b05 SHA512 0e2f54f9423c9250903ea9b53e11aee47b84c40fbb2f488b048617f128d4f1b77bcf39a3fe5c133526f51a2d613185cfdbae1b1586f11c87a004b23f24737092
diff --git a/net-wireless/kalibrate-hackrf/kalibrate-hackrf-20160604.ebuild b/net-wireless/kalibrate-hackrf/kalibrate-hackrf-20160604.ebuild
new file mode 100644
index 000000000..5f5acbe62
--- /dev/null
+++ b/net-wireless/kalibrate-hackrf/kalibrate-hackrf-20160604.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Calculate the local oscillator frequency offset using GSM stations"
+HOMEPAGE="https://github.com/scateu/kalibrate-hackrf"
+HASH_COMMIT="2492c20822ca6a49dce97967caf394b1d4b2c43e"
+SRC_URI="https://github.com/scateu/kalibrate-hackrf/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sci-libs/fftw
+	net-libs/libhackrf"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${HASH_COMMIT}"
+
+src_prepare(){
+#	eautoreconf
+	./bootstrap
+	eapply_user
+}
diff --git a/net-wireless/kalibrate-hackrf/kalibrate-hackrf-9999.ebuild b/net-wireless/kalibrate-hackrf/kalibrate-hackrf-9999.ebuild
deleted file mode 100644
index 0c3231904..000000000
--- a/net-wireless/kalibrate-hackrf/kalibrate-hackrf-9999.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools git-r3
-
-DESCRIPTION="A tool to scan GSM base stations and calculate the local oscillator frequency offset"
-HOMEPAGE="https://github.com/scateu/kalibrate-hackrf"
-EGIT_REPO_URI="https://github.com/scateu/kalibrate-hackrf.git"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare(){
-#	eautoreconf
-	./bootstrap
-}