diff --git a/net-analyzer/ham2mon/Manifest b/net-analyzer/ham2mon/Manifest
new file mode 100644
index 000000000..30ec9bd23
--- /dev/null
+++ b/net-analyzer/ham2mon/Manifest
@@ -0,0 +1,2 @@
+DIST ham2mon-20170603.tar.gz 211244 BLAKE2B e69016d0bc733cab46cc86976b29eb6e9f33b3129538f9fe0bbe4011d7e60f9ee08dfc3eb370c70b427d854344c1a656915069630a1434868710c02e1654f134 SHA512 05ee2aafc773c0546147147e9c80f1fb0892f7607a31195cf2ea541ece0270d5aad36cf4dcbcb33552f9d2fb0b03f76612c535749115bdff713b90aa921b1404
+EBUILD ham2mon-20170603.ebuild 927 BLAKE2B b681b3d9c5784a2e8c64dbf0a7841a8cbe533c2aa68f0d2a3f3dda7350af6e58bd8b720195065f78ec29f5a5d97f92e23265ed29f20e4bac3a07c0c5dd0d5992 SHA512 3e7b685b9ebf0fac08945d6f36b485f3ea355c358b4d1145ba64f0e667ce433e29e9815906100f6cb1ef17d54c3d78da2e4eee19f3a4c37811ab8062d063aa56
diff --git a/net-analyzer/ham2mon/ham2mon-20170603.ebuild b/net-analyzer/ham2mon/ham2mon-20170603.ebuild
new file mode 100644
index 000000000..0351a8939
--- /dev/null
+++ b/net-analyzer/ham2mon/ham2mon-20170603.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+EGO_PN=github.com/madengr/${PN}
+
+inherit python-single-r1 python-utils-r1
+
+if [[ ${PV} = *9999* ]]; then
+        inherit git-r3
+        EGIT_REPO_URI="https://github.com/madengr/ham2mon.git"
+        KEYWORDS=""
+else
+        KEYWORDS="~amd64 ~x86"
+        EGIT_COMMIT="d15fd94b253a1a854a7f106dd105a3d83dcbee00"
+        SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="A GNU Radio (GR) based SDR scanner with a Curses interface."
+HOMEPAGE="https://github.com/madengr/ham2mon"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="~dev-lang/python-2.7"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+src_install(){
+        newbin apps/"${PN}".py "${PN}"
+		python_fix_shebang "${ED}"usr/bin
+		python_domodule apps/*.py
+}
+