diff --git a/net-libs/libndpi/Manifest b/net-libs/libndpi/Manifest
index aceae7bec..3df13f82b 100644
--- a/net-libs/libndpi/Manifest
+++ b/net-libs/libndpi/Manifest
@@ -1,3 +1,2 @@
-DIST libndpi-1.5.0_r8115.tar.gz 1140853 SHA256 c37b572b1a46643bfc127af197735c47c7895517ab397a4e5489c0ea82602740 SHA512 ff5c700e38b802d05937e8bee8bb45e21c0acb85e4ad9bdd2221960ce133b72eb6a0f4a9ffe2dd0faa09b7c9cc9308f80e20afac80c7991adf0ecc7d1c95b4a5 WHIRLPOOL eb661dc2ac62cdaa41f36c67f8dc343058b909f8c9830f0cc0cde52243d514a64729f0a580a48149820b832ba5f2b597b31763686309ce96167cc93d27f7cecb
-DIST libndpi-1.5.1.tar.gz 516961 SHA256 32f15bcb273ddaead6cb3d57b47e1afa3cb20bb363d61ef294c5aa57a9c07e58 SHA512 369dc1e12455bf27d39c128ea5068d676ca09067ba5d8234a9a1a1acb3bf11442f511f466a82104f9f851202a9692a54cf589659d458d519650e14ffe7fcbd11 WHIRLPOOL 0e8fc838ee8e9a6f964713efb72cdb090fbbc5b49a8111fae5d4cb00f4737f38b3d0f5ded88c15dd51571c670f5dca858c7eacdba7a080d88c8ea39bc54bf7b9
 DIST libndpi-1.6.tar.gz 1837027 SHA256 0863c7096f70c785e1b27a34f7b40939ac1a0e3a734ea3dcaa5cf161360a2561 SHA512 aa74b06fcf9ecdb9c094fd59fd8d9ce3d6ca3a6512bb9de55e07b86e16f935ab1465727885651788fa30417a62ce800ac06d03e87f4a64a0644a3688e04f77f8 WHIRLPOOL 65e0aa8f2d4dbf699b2569f0554f3de644f654a097187772cf60cb05e64222a6e4d738f645aaf97c68a88ee744424f20572d7723eca0bfce47234ecebb6b3540
+DIST libndpi-1.8.tar.gz 7238087 SHA256 cea26a7f280301cc3a0e714b560d48b57ae2cf6453b71eb647ceb3fccecb5ba2 SHA512 6a9a995e86c0d940fd27046b1ddf0556a02f88d4d4b188db99da25d6a5acb7eb26889b2e9d197c86d5deec6c2d3fc0707e10bc645339e3f36519664dc9c15bd1 WHIRLPOOL 4ecc867fd4ca059363e7f99083330e93442e2afda1a2f6e8d4f8ada20924c0e405963d822d528aa576b1baa9b7420d22c3fcff23a41348899965fc6681148994
diff --git a/net-libs/libndpi/files/libndpi-1.6-system.patch b/net-libs/libndpi/files/libndpi-1.6-system.patch
deleted file mode 100644
index 9f27ad24b..000000000
--- a/net-libs/libndpi/files/libndpi-1.6-system.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/Makefile.am.orig	2014-08-13 23:11:36.000000000 +0800
-+++ src/lib/Makefile.am	2014-09-02 04:52:33.883473067 +0800
-@@ -3,7 +3,7 @@
- libndpi_la_CPPFLAGS = -I$(top_srcdir)/src/include/  -I$(top_srcdir)/src/lib/third_party/include/
- libndpi_la_LDFLAGS = -version-info 1:0:0 -export-symbols $(top_srcdir)/libndpi.sym
- 
--libndpi_la_includedir = $(includedir)/libndpi-@VERSION@/libndpi
-+libndpi_la_includedir = $(includedir)/libndpi
- 
- libndpi_la_include_HEADERS = ../include/ndpi_api.h \
- 			     ../include/linux_compat.h \
diff --git a/net-libs/libndpi/libndpi-1.5.0.ebuild b/net-libs/libndpi/libndpi-1.5.0.ebuild
deleted file mode 100644
index 950fe2726..000000000
--- a/net-libs/libndpi/libndpi-1.5.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-inherit autotools eutils
-
-DESCRIPTION="ntop-maintained superset of the popular OpenDPI library"
-HOMEPAGE="http://www.ntop.org/products/ndpi/"
-SRC_URI="mirror://sourceforge/ntop/nDPI/${P}_r8115.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-system.patch
-	eautoreconf
-}
diff --git a/net-libs/libndpi/libndpi-1.5.1.ebuild b/net-libs/libndpi/libndpi-1.8.ebuild
similarity index 69%
rename from net-libs/libndpi/libndpi-1.5.1.ebuild
rename to net-libs/libndpi/libndpi-1.8.ebuild
index 68c0db1ab..3751582b6 100644
--- a/net-libs/libndpi/libndpi-1.5.1.ebuild
+++ b/net-libs/libndpi/libndpi-1.8.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI="5"
+EAPI=6
+
 inherit autotools eutils
 
 DESCRIPTION="ntop-maintained superset of the popular OpenDPI library"
 HOMEPAGE="http://www.ntop.org/products/ndpi/"
-SRC_URI="mirror://sourceforge/ntop/nDPI/${P}.tar.gz"
+SRC_URI="https://github.com/ntop/nDPI/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -17,7 +17,10 @@ IUSE=""
 DEPEND=""
 RDEPEND=""
 
+S="${WORKDIR}/nDPI-${PV}"
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.5.0-system.patch
 	eautoreconf
+	default
 }