diff --git a/net-analyzer/voiphopper/Manifest b/net-analyzer/voiphopper/Manifest
index 3e6e75b1b..7049754c8 100644
--- a/net-analyzer/voiphopper/Manifest
+++ b/net-analyzer/voiphopper/Manifest
@@ -1,4 +1,4 @@
-DIST voiphopper-1.02.tar.gz 61010 RMD160 ef4c2703f7db752bfc71677aa2022a52cb816565 SHA1 dea3320d9b13809e661efdecba83bd9a3d4d3ab2 SHA256 ac411383cc0568f428530eecb84d75cfc6e3a147316018eb72ffd5f774b6a1e4
 DIST voiphopper-2.01.tar.gz 339984 RMD160 8a5d43ceae0082b0eb178babf62a0fc8b38f74d4 SHA1 1d7ebd0550c3d1bda282b0404fdebea0673b5622 SHA256 3903ab10d126b8e5337f144a3c1718cd59ee21765a9ef0ec158c8f666cd6837d
-EBUILD voiphopper-1.02.ebuild 685 RMD160 38fd2fe2127020c69b91edf2212facce17109ec5 SHA1 7f7f3a21878da072f503fd7afafcd9fe88eb4151 SHA256 1418a8234087666bf31d91f183bbefa76bd7f925636d4d9806fee4ed6d507b6b
+DIST voiphopper-2.04.tar.gz 352311 RMD160 8fa23c7ced8b2e05f183eeb6055ed066bafc771d SHA1 262b3e88e3a58adc351aacaadb0e32eca60a9d61 SHA256 ff26b67507b084ec7b53b1690c540a87505cb9bd428a0f78cf535f9707aab109
 EBUILD voiphopper-2.01.ebuild 558 RMD160 6d5ccb2e1d07236590fae8b7cc0a8f9e1fc5fe0c SHA1 c4aac9c568ac7e4b30c09bcddffd448d510fdcb1 SHA256 5cca0e3096cb5f446c05a31ecabd1d00c0743a28ef10ba02685e28fc6d74fa81
+EBUILD voiphopper-2.04.ebuild 558 RMD160 6d5ccb2e1d07236590fae8b7cc0a8f9e1fc5fe0c SHA1 c4aac9c568ac7e4b30c09bcddffd448d510fdcb1 SHA256 5cca0e3096cb5f446c05a31ecabd1d00c0743a28ef10ba02685e28fc6d74fa81
diff --git a/net-analyzer/voiphopper/voiphopper-1.02.ebuild b/net-analyzer/voiphopper/voiphopper-2.04.ebuild
similarity index 62%
rename from net-analyzer/voiphopper/voiphopper-1.02.ebuild
rename to net-analyzer/voiphopper/voiphopper-2.04.ebuild
index 81744c0da..65636c8fd 100644
--- a/net-analyzer/voiphopper/voiphopper-1.02.ebuild
+++ b/net-analyzer/voiphopper/voiphopper-2.04.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=4
+inherit linux-info
 
 DESCRIPTION="VoIP Hopper is a tool that rapidly runs a VLAN Hop into the Voice VLAN"
 HOMEPAGE="http://voiphopper.sourceforge.net/"
@@ -16,14 +17,12 @@ IUSE=""
 DEPEND="net-libs/libpcap"
 RDEPEND="${DEPEND}"
 
-src_compile() {
-	# remove debug flags and compile with own cflags
-	sed -i "s|-g|$CFLAGS|g" Makefile || die "sed failed"
-	sed -i "s|-c|$CFLAGS -c|g" Makefile || die "sed failed"
-	emake || die "emake failed"
+pkg_setup() {
+	CONFIG_CHECK="~VLAN_8021Q"
+	linux-info_pkg_setup
 }
 
 src_install() {
-	dobin voiphopper || die
-	dodoc README || die
+	dobin src/voiphopper
+	dodoc README USAGE
 }