diff --git a/net-proxy/zaproxy/Manifest b/net-proxy/zaproxy/Manifest
index 676118810..a6d89927e 100644
--- a/net-proxy/zaproxy/Manifest
+++ b/net-proxy/zaproxy/Manifest
@@ -10,3 +10,4 @@ DIST zaproxy-2.7.0-scripts-beta-24.zap 639756 BLAKE2B 07fd8701bbf719614ca2131d2d
 DIST zaproxy-2.7.0-selenium-release-14.zap 22697462 BLAKE2B 7dd990a1a2b99ddd452b020765a2ab7e19c55e6ff1b7555ddfe080d788517f006d3b29daa9ae3ae02d43ca28a1f037188afceafa7aa492fa35543beea04ea2fe SHA512 2da18e0d26a83bbb40065c20a52211103ed84fa9451540dd23dc2585c7ccf85b9ac297398b3677396ca77ccc85be737e7344c75a0449b8c971f36c01fe1a8450
 DIST zaproxy-2.7.0-websocket-release-18.zap 952969 BLAKE2B 5de9e9da21dbd42d872d65f13b9989bc652f37be61e961d4f761021e4dcd0d410fe35207ee6acd5b64018f1352a80aad33cdfd48b71c9cfa234d9e7630168066 SHA512 c0ee29bfe448cfdc30a6d7d5aa579d03b5649abdf12806a6460f11c808fb1a9aed7a5e6923b881ddffff65294f4ef539a406f32817b399b9431dad0db60a1aae
 DIST zaproxy-2.7.0-zest-beta-28.zap 2154460 BLAKE2B 9d2d065944f8c985ada97ecc8a1a59f1627b11433e199b9a31c63e85c7f9d2a220a013ea71f14d8490aa3abc367129d1cae9fd982d1d22b8d62f77e9a0c797e0 SHA512 009bb144e7df2f73423566d53532564bf3b440528987139f37c0ec24a5b808483e0a177ec23e27cbcf106d0ec04c00e027c8b6d4668b93286d56b85bdbbf2dee
+DIST zaproxy-2.8.0_rc2.zip 347310339 BLAKE2B f1d2973d682cfec2dc09ee33123bbbae6e4f23377509bc5f8202e6b825f844b86925a0103f4d67b4d8c3be5dd1f539fc99dc97dee2e83f605381fd63f7ebfa86 SHA512 5434cc577f718a63390b5bfbfbf9eb614e136dad5ca814156147f81b795231bb85720c66a0bfc42571978d98c68212277b569dbc0cfb8a5e5195a9a0116f3322
diff --git a/net-proxy/zaproxy/zaproxy-2.7.0-r1.ebuild b/net-proxy/zaproxy/zaproxy-2.7.0-r1.ebuild
index 911bcc7ca..c28578d76 100644
--- a/net-proxy/zaproxy/zaproxy-2.7.0-r1.ebuild
+++ b/net-proxy/zaproxy/zaproxy-2.7.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 MY_PN="ZAP"
 MY_P="${MY_PN}_${PV}"
@@ -37,7 +37,7 @@ SRC_URI="https://github.com/zaproxy/zaproxy/releases/download/${PV}/ZAP_${PV}_Co
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="x86 amd64"
+KEYWORDS="amd64 x86"
 IUSE="+plugins"
 RESTRICT="mirror"
 
diff --git a/net-proxy/zaproxy/zaproxy-2.8.0_rc2.ebuild b/net-proxy/zaproxy/zaproxy-2.8.0_rc2.ebuild
new file mode 100644
index 000000000..2bc51a945
--- /dev/null
+++ b/net-proxy/zaproxy/zaproxy-2.8.0_rc2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="ZAP"
+MY_PV="D-2019-05-23"
+MY_P="${MY_PN}_${MY_PV}"
+
+#Workaround to sava zap ext under different filename
+#https://github.com/zaproxy/zap-extensions/releases/tag/2.7
+#https://raw.githubusercontent.com/zaproxy/zap-admin/master/ZapVersions-2.7.xml
+#https://raw.githubusercontent.com/zaproxy/zap-admin/master/ZapVersions-dev.xml
+
+ZAP_EXTENSIONS_URI="https://github.com/zaproxy/zap-extensions/releases/download/2.7"
+
+declare -a PLUGINS
+PLUGINS[0]="ascanrules;release;32"
+PLUGINS[1]="pscanrules;release;23"
+PLUGINS[2]="bruteforce;beta;7"
+PLUGINS[3]="scripts;beta;24"
+PLUGINS[4]="diff;beta;8"
+PLUGINS[5]="websocket;release;18"
+PLUGINS[6]="quickstart;release;25"
+PLUGINS[7]="selenium;release;14"
+PLUGINS[8]="zest;beta;28"
+PLUGINS[9]="invoke;beta;9"
+PLUGINS[10]="fuzz;beta;10"
+
+for i in "${PLUGINS[@]}"
+do
+	arr=(${i//;/ })
+	#url-base versioning workaround
+	PL_URL="${PL_URL} ${ZAP_EXTENSIONS_URI}/${arr[0]}-${arr[1]}-${arr[2]}.zap -> ${P}-${arr[0]}-${arr[1]}-${arr[2]}.zap"
+done
+
+DESCRIPTION="The OWASP Zed Attack Proxy for finding vulnerabilities in web applications"
+HOMEPAGE="https://github.com/zaproxy/zaproxy"
+SRC_URI="https://github.com/zaproxy/zaproxy/releases/download/w2019-05-23/${MY_PN}_WEEKLY_${MY_PV}.zip -> ${P}.zip"
+#	plugins? ( $PL_URL ) "
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="plugins"
+IUSE=""
+
+RESTRICT="mirror"
+
+RDEPEND="|| ( virtual/jre virtual/jdk )
+	!virtual/jre:1.6
+	!virtual/jdk:1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	use plugins && einfo "plugins are bundled in this version.\n Please disable the use flag"
+
+	if use plugins ; then
+		rm "${S}"/plugin/ascanrules-*.zap
+		rm "${S}"/plugin/pscanrules-*.zap
+		rm "${S}"/plugin/bruteforce-*.zap
+		rm "${S}"/plugin/diff-*.zap
+#		rm "${S}"/plugin/plugnhack-*.zap
+		rm "${S}"/plugin/quickstart-*.zap
+		rm "${S}"/plugin/invoke-*.zap
+
+		for i in "${PLUGINS[@]}"
+		do
+			arr=(${i//;/ })
+			cp "${DISTDIR}/${P}-${arr[0]}-${arr[1]}-${arr[2]}.zap" "${S}"/plugin/${arr[0]}-${arr[1]}-${arr[2]}.zap
+		done
+	fi
+	#use external tool
+#	rm -r "${S}"/fuzzers/fuzzdb-1.09 || die "Unable to remove fuzzdb"
+	eapply_user
+}
+
+src_install() {
+	dodir /opt/"${PN}"
+	cp -R "${S}"/* "${D}/opt/${PN}" || die "Install failed!"
+	dosym /opt/"${PN}"/zap.sh /usr/bin/zaproxy
+}
+
+pkg_postinst() {
+	einfo "Zaproxy requires jdk/jre >=7. Make sure it is enabled by running the following:"
+	einfo "eselect java-vm set [user|system] [vm]"
+}