diff --git a/net-proxy/sshttp/metadata.xml b/net-proxy/sshttp/metadata.xml
new file mode 100644
index 000000000..4fa8ff351
--- /dev/null
+++ b/net-proxy/sshttp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-proxy/sshttp/sshttp-0.35_p2.ebuild b/net-proxy/sshttp/sshttp-0.35_p2-r1.ebuild
similarity index 50%
rename from net-proxy/sshttp/sshttp-0.35_p2.ebuild
rename to net-proxy/sshttp/sshttp-0.35_p2-r1.ebuild
index 3d478e31f..09ee77248 100644
--- a/net-proxy/sshttp/sshttp-0.35_p2.ebuild
+++ b/net-proxy/sshttp/sshttp-0.35_p2-r1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="An easy to use OSI-Layer5 switching daemon"
+HOMEPAGE="https://c-skills.blogspot.com/"
 
-DESCRIPTION="an easy to use OSI-Layer5 switching daemon"
-HOMEPAGE="http://c-skills.blogspot.com/"
 MY_PV=${PV/./-}
 MY_P="${PN}-splice-${MY_PV/_p/s}"
 SRC_URI="https://github.com/stealth/sshttp/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
-#sshttp-splice-0-35s2.tar.gz
-
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="net-libs/libpcap"
 RDEPEND="${DEPEND}"
@@ -22,17 +22,18 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN}-${MY_P}"
 
 src_prepare() {
-	sed -i "s|-O2|$CFLAGS|g" Makefile || die
-	eapply_user
+	default
+	sed -i "/^CFLAGS/s|-O2|${CFLAGS}|g" Makefile || die
 }
 
 src_compile() {
-	einfo "This is about to die due to https://github.com/stealth/sshttp/issues/7"
-	default
+	emake CXX=$(tc-getCXX) LD=$(tc-getLD)
 }
 
 src_install() {
-	dobin sshttpd || die
-	dodoc README || die
-	dobin nf-setup || die
+	dobin sshttpd
+	dodoc *.md Changelog HINTS
+
+	exeinto /usr/share/${PN}
+	doexe nf-setup
 }