diff --git a/app-fuzz/slowhttptest/Manifest b/app-fuzz/slowhttptest/Manifest
index 4eb99b21b..b9c350261 100644
--- a/app-fuzz/slowhttptest/Manifest
+++ b/app-fuzz/slowhttptest/Manifest
@@ -1,2 +1,3 @@
 DIST slowhttptest-1.4.tar.gz 102699 SHA256 d15635c056a044cfbf63822ce0452bbe1ed1a3ca24471cf4b7d04c375e21153c SHA512 7110727b6955bd62d532b0cfa5768450e0106e9fd935fa59991fcf276b2e571cf96d268cb09e251c08c619240062b2f053f954d1fdb3596e829a7f06873fe0cf WHIRLPOOL 2dc74284eb580c8b911788f867c60b9f065a5122fa02413afbb9e6ab65d922af9b4f245468458aa82ec05e2a8a4a045cbb83a1b6cf43d99ff9f62b6d747a21cd
 DIST slowhttptest-1.5.tar.gz 104233 SHA256 23750c7f04ac6da5567014c40d0eb4bac148cba95fa88c50a6f34ccc1579e23b SHA512 c1b11f57da637a827047948fcf1fb35b142631c428053b0d847657ab293bae50d259256ca3a2da2950c6621de016db6d687dbd06fd86510a3a666a469059b8a7 WHIRLPOOL 428d669637d7022a9a676062cafb87409bd02c76e7a9bff3b0f8ed11882beccf4d397f624a47f6882e87f753e9eeaa929094f554c3648d808be66bf07e2f8efd
+DIST slowhttptest-1.7.tar.gz 117115 SHA256 9fd3ce4b0a7dda2e96210b1e438c0c8ec924a13e6699410ac8530224b29cfb8e SHA512 f3dcab977ce538f8b74bee0649e8941d2928d8497a3611ecb6a6367b193b3a8251e90368bdbf4e58096f37afd268aff12d5c60981eb560fc08465a5fedebf069 WHIRLPOOL 8866b835fc31717cf733106f82c4d6c583ebe940ed906b7bbbba3ae9539c71766033c880bb40b430de7ca7b6ddebf31cf6eeb39872c5972b33ebf7ecadac0cec
diff --git a/app-fuzz/slowhttptest/slowhttptest-1.4.ebuild b/app-fuzz/slowhttptest/slowhttptest-1.4.ebuild
deleted file mode 100644
index 64859e7f9..000000000
--- a/app-fuzz/slowhttptest/slowhttptest-1.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Application Layer DoS attack simulator"
-HOMEPAGE="http://code.google.com/p/slowhttptest"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/1.4-add-includes.patch
-}
-
-# QA: LDFLAGS issues need to be solved by the upstream
-
-#src_configure() {
-#	LDFLAGS="${LDFLAGS}" econf
-#	econf
-#}
-
-src_install() {
-	dobin src/slowhttptest
-}
diff --git a/app-fuzz/slowhttptest/slowhttptest-1.5.ebuild b/app-fuzz/slowhttptest/slowhttptest-1.7.ebuild
similarity index 58%
rename from app-fuzz/slowhttptest/slowhttptest-1.5.ebuild
rename to app-fuzz/slowhttptest/slowhttptest-1.7.ebuild
index 655a14d30..c1c466c11 100644
--- a/app-fuzz/slowhttptest/slowhttptest-1.5.ebuild
+++ b/app-fuzz/slowhttptest/slowhttptest-1.7.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=4
+EAPI=6
 
 inherit eutils
 
 DESCRIPTION="Application Layer DoS attack simulator"
-HOMEPAGE="http://code.google.com/p/slowhttptest"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+HOMEPAGE="https://github.com/shekyan/slowhttptest"
+SRC_URI="https://github.com/shekyan/slowhttptest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=" ~arm amd64 x86"
 IUSE=""
 
-DEPEND="dev-libs/openssl"
+DEPEND="dev-libs/openssl:="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/1.4-add-includes.patch
-	epatch "${FILESDIR}"/1.5-ldflags.patch
+	eapply_user
 }
 
 src_install() {