diff --git a/net-wireless/gr-gsm/Manifest b/net-wireless/gr-gsm/Manifest
new file mode 100644
index 000000000..b8545eb95
--- /dev/null
+++ b/net-wireless/gr-gsm/Manifest
@@ -0,0 +1 @@
+DIST gr-gsm-20200214.tar.gz 417507 BLAKE2B cd3393773db7f51ccd8de6b266aab5b169372d1eb1dd73a866202b4b9f4568268f058e8d3b2901720a0b2bb3c2d5b4b1dc760bdc2e69a0bafa83508893325ce4 SHA512 78f65a1ee1965f4e2eab9b9f5acdea030151df1f452e8a61bf36ec6b29299340ba9adc755cee8ec4de7f67b17729629880b1819e1a7d8d0d1f20ac578ed11291
diff --git a/net-wireless/gr-gsm/gr-gsm-20200214.ebuild b/net-wireless/gr-gsm/gr-gsm-20200214.ebuild
new file mode 100644
index 000000000..141bf0b9c
--- /dev/null
+++ b/net-wireless/gr-gsm/gr-gsm-20200214.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake cmake-utils python-single-r1
+
+DESCRIPTION="Set of tools for receiving information transmitted by GSM equipment/devices"
+HOMEPAGE="https://github.com/ptrkrysik/gr-gsm"
+#EGIT_REPO_URI="https://github.com/ptrkrysik/gr-gsm.git"
+#EGIT_BRANCH="porting_to_gr38"
+HASH_COMMIT="fd4454d6ec6e2e65db60519892e77dece299a6c7"
+SRC_URI="https://github.com/ptrkrysik/gr-gsm/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="doc"
+
+DEPEND=">=net-wireless/gnuradio-3.8.0:=
+	net-wireless/gr-osmosdr
+	dev-util/cppunit
+	net-libs/libosmocore"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${HASH_COMMIT}"
+
+src_prepare() {
+	#fixme below
+	sed -i "s|\${GR_DOC_DIR}\/\${CMAKE_PROJECT_NAME}|${EPREFIX}/usr/share/doc/${PF}|g" CMakeLists.txt
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_DOXYGEN="$(usex doc)"
+#		-DGR_PKG_DOC_DIR="$(usex doc ${EPREFIX}/usr/share/doc/${PF})"
+		-DPYTHON_EXECUTABLE=${PYTHON}
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_optimize "${ED}/$(python_get_sitedir)"
+}
diff --git a/net-wireless/gr-gsm/gr-gsm-9999.ebuild b/net-wireless/gr-gsm/gr-gsm-9999.ebuild
deleted file mode 100644
index 9e4cb3454..000000000
--- a/net-wireless/gr-gsm/gr-gsm-9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 cmake-utils git-r3
-
-DESCRIPTION="Set of tools for receiving information transmitted by GSM equipment/devices"
-HOMEPAGE="https://github.com/ptrkrysik/gr-gsm"
-EGIT_REPO_URI="https://github.com/ptrkrysik/gr-gsm.git"
-
-KEYWORDS=""
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="doc"
-
-DEPEND=">=net-wireless/gnuradio-3.7.0:=
-	net-wireless/gr-osmosdr
-	dev-util/cppunit
-	net-libs/libosmocore"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i "s|gr-grgsm|gr-gsm|g" CMakeLists.txt
-#fixme below
-	sed -i "s|\${GR_DOC_DIR}\/\${CMAKE_PROJECT_NAME}|${EPREFIX}/usr/share/doc/${PF}|g" CMakeLists.txt
-}
-
-#Fixme: GR_PKG_DOC_DIR is not getting set
-#		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_enable doc DOXYGEN)
-		#fix wierd GrPython.cmake
-		-DPYTHON_EXECUTABLE=${PYTHON}
-	)
-	cmake-utils_src_configure
-}