diff --git a/dev-go/gopkg-sourcemap/Manifest b/dev-go/gopkg-sourcemap/Manifest
new file mode 100644
index 000000000..93944228e
--- /dev/null
+++ b/dev-go/gopkg-sourcemap/Manifest
@@ -0,0 +1 @@
+DIST gopkg-sourcemap-2.1.2.tar.gz 6378 BLAKE2B 3dfeaf2c16ffd271bb2811601cd2dee0f551e8db0fca65b58327177e92125cfa90f1b75aa68b0f78acb9b2d06fbf66aeceb14ef9606d4447745bc754d6f298eb SHA512 b4548b7e634a0039d63443a831c9dce44adc7a1f340fe58516bfa79db8793e4f8f901e79dbea8b56c3f7158074081ea92407fe6bafca2b7a5b4d0d53dedb4700
diff --git a/dev-go/gopkg-sourcemap/gopkg-sourcemap-2.1.2.ebuild b/dev-go/gopkg-sourcemap/gopkg-sourcemap-2.1.2.ebuild
new file mode 100644
index 000000000..c06bfed34
--- /dev/null
+++ b/dev-go/gopkg-sourcemap/gopkg-sourcemap-2.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/go-sourcemap/sourcemap gopkg.in/sourcemap.v1"
+
+#EGO_PN="gopkg.in/sourcemap.v1 github.com/go-sourcemap/sourcemap"
+
+#EGO_VENDOR=(
+#	"gopkg.in/sourcemap.v1"
+#	"gopkg.in/sourcemap.v1 6e83acea0053641eff084973fee085f0c193c61a github.com/go-sourcemap/sourcemap"
+#	"github.com/go-sourcemap/sourcemap"
+#)
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+#https://bugs.gentoo.org/673704
+#	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
+#	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/go-sourcemap/sourcemap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+
+inherit golang-build
+
+DESCRIPTION="Source maps consumer for Golang"
+HOMEPAGE="https://godoc.org/github.com/go-sourcemap/sourcemap"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/go-1.10"
+DEPEND="${RDEPEND}"
diff --git a/net-analyzer/amass/Manifest b/net-analyzer/amass/Manifest
index ea55d24be..c3d6ff079 100644
--- a/net-analyzer/amass/Manifest
+++ b/net-analyzer/amass/Manifest
@@ -1,8 +1,16 @@
 DIST amass-2.8.4.tar.gz 7940941 BLAKE2B 8f4b79abf5440d98c3269eb8127dce68ea3aad53addffcd4c3fc20145ecc3fa261fe3c9a35c788584df4e99f322903bed4a9e979bcff403502b920e3e8139722 SHA512 2ce1b184777c0e6164ba3264cee44ab5c87768641d04080d48f4832cfbe7533c3aedd11ac0334f997513f08bb95420cd591c10d5647430b36127bfd0dea37e71
 DIST amass-2.8.6.tar.gz 7946050 BLAKE2B b4f7a4fabd830661b736b065d0ce50851c406acff09c92afc63737f2981935125189f9a103f57fe5a3a88a8831acbf91ab814b410dfedfc9a6c7282b06167a00 SHA512 23766f08caf07cb6aa5e023ff2a8058bd444ea6fde1ededf0d8afb8f9e4c8402df2ad1f845515b4f1b92b43d2857a99ece264396cd0b1ba32e9a18939a8ab2d7
+DIST amass-2.8.7.tar.gz 7949427 BLAKE2B 1247f424138ab51800edee6d7debb15116831490040b6917c28f6b06542551ca7b7a14e2018cf0790441cb00e9fe8bb06f1a907613269fb64e0278b2bcdc2580 SHA512 2569319e54062ade745696bcf48c157613bf3aeb0f2e69800c2a42c16a1bbc2548407294d5860b95d6699edf1545eb1d942cfd1070b8b1d2cf62f6561496fb0a
 DIST github.com-asaskevich-EventBus-d46933a94f05c6657d7b923fcf5ac563ee37ec79.tar.gz 7295 BLAKE2B 81bbdc7132c2371dd6dfb441fa587907fb7aa253d5686332b7829345e60dd8e697d7f185ea4920ccbab24d89487051722b8b4a74b7a225448ec776a3f38ef390 SHA512 3e0b9dddc4e5020cf0ffade6c96149edf427909a74dd59db3c753c91c588a49869a5aecdc751492ef7986029452ceb458ab9a56ea86d84283d3f90d1476c2807
+DIST github.com-caffix-cloudflare-roundtripper-4c29d231c9cb6ed0381bd10db5502610a2f59df9.tar.gz 6975 BLAKE2B 70e550cf87d1d898052a0eab08421cc3540b484687c1cac600fe85dac31293e3e3c69566e93f433d2ad04405f18b570d7e023030f07848dd25b65934be44ff62 SHA512 fbb77943da4e5b181c7501a6c631bb29ccbf4a302b27729942b934636bd86a9565bd436984b65c59cb6201a26c99475701000e529c63a400b758b5971e2ca908
+DIST github.com-cenkalti-backoff-62661b46c4093e2c1f38d943e663db1a29873e80.tar.gz 8622 BLAKE2B 3181c47075d2eb7c69d2e4ed0bd0e21e1ab73e6aa1ae92d1ca867441358bfc1ddd1ac5fb45da490dcfef075a9f1b6b747bbd9aed3d8252ebfeffb77722a4b0df SHA512 bdde676e3f535f11b0de02f94f8a0928111824ec07fbdb01391136549a7d090ff9f11e9629c2c5c50d1b896f92ebba913b9ab32685cf8cb9ec73bbbe8579cd3d
+DIST github.com-dghubble-go-twitter-7ecc41c771b6fe11669159da651b6adf06ee60bf.tar.gz 35616 BLAKE2B bf335bb1f7bf0213436c990f10def1be8bcf1abe58078ef15f1b8c8414995d88f98d118fa99360db7ebb6ae929a7360bbac7d00c9c24b38e994e2509fe07196a SHA512 c2de6461903cb045d397b425eb0193a7362dcc45168a3f51f19cbebcf188fc86c908fadebb6acdc06b5a24b56e2a1c1b517ca9a103a5d1b22133d5636df2f9b2
+DIST github.com-dghubble-sling-7458fd7fa70b9b22f53ffe4a632bd5ae11284a89.tar.gz 16647 BLAKE2B ebd40e20309580fd7b2959434024c86462d2d6355aa6171f8c2f052511473e7beee0d8eb04d56274069a7d081e2a468947b1d0ae566d61586bf29ab3215a8968 SHA512 484d5aaf421c2a585ed27c6b75f87061ba392d02b85edaa9280726767a6ec83c50bf1b65b54f4bace3120a1ae644cf29e5842b1e4e560db7d5fe49cc795c22f8
 DIST github.com-fatih-color-2d684516a8861da43017284349b7e303e809ac21.tar.gz 818359 BLAKE2B 2b7a1f6730caf1d4f95d302a3cd5ecf4d67737bf652f7560a1f01f9629841c0293b129344e014a599e5e564670f8c11e90d64c8c5f1e14f1e47232ec7e7fa3a8 SHA512 19245e614e39dfab856a11e7d02aea6360936c40b6dc8cfee15e29480cc21e7b1b9840cb18214ec8f5b2f97b147b3e7041e3b3e9179960b903fc2fd4f39d0edc
 DIST github.com-go-ini-ini-f55231ca73a76c1d61eb05fe0d64a1ccebf93cba.tar.gz 34809 BLAKE2B e7f76e17cfe44681ccbedc3cf666012518d32557687ac6d4dc13e433281d45d8fe66f7d0bd9f69f2959473b1ab99f722496290e06b6827bd3cc37749f12394a2 SHA512 fb42a04b468f61e6a853f8698912d041616595928a1b287f58c52597f81e0f65c29d9ebe54b720cb5e451b668027a434c9af06840fbdc2d2dc20e523ef382bcd
+DIST github.com-go-sourcemap-sourcemap-6e83acea0053641eff084973fee085f0c193c61a.tar.gz 5360 BLAKE2B f4101b07a6d405a5b01adb0029b52b7f6cae1122df201909a1201885a2e7f5439cd6f634325e205dd3eb5c4cba1e159b8c4021233d396a1c5664bc0db513f472 SHA512 84d4aa5ed44aede33bd17186e34e06eb3e878c6ca5143e26d4ee4d73f19746858575d20628c440c58d9d77b55efd34460db7106056a3b8eb6d4adab24f0ae243
+DIST github.com-google-go-querystring-44c6ddd0a2342c386950e880b658017258da92fc.tar.gz 7528 BLAKE2B 0a32c86f588be6922bbe0238d3de9daf123709ccc828cd41fbcccff15155ff8ead5b63defd09c7ea84123bddf9cc098129e177c753d3723080fd27460788c33f SHA512 a5d6e4c3fbd2536091c39ffd65443c9aacc34f3d1c7a39344cec7d8f5b6ac4383a980c273f811bb0ac9518d389c28a6d41b4828d54e714f596f12f5aa0ec82dc
 DIST github.com-irfansharif-cfilter-d07d951ff29d52840ca5e798a17e80db4de8c820.tar.gz 6083 BLAKE2B b814a84eef5cfb8adbfe7f9d5b2ae03313cf9b3048c9f7430fe200ed97f0e29f078cf8a82ed929dfb8fb293fd74fcd20ff44dba19004d51f6b63f5bc4367752b SHA512 26f2a01603274d21d8f386a29ab6ae5d0c0db5d0777b6b1377e6a61061682f718a809494a6734a8553b8e54992dbb8d4bb1e0614caf1efcbdb5c897c468ef825
 DIST github.com-johnnadratowski-golang-neo4j-bolt-driver-c68f22031e4222b95e684bf7c4f593ec42ad775a.tar.gz 472738 BLAKE2B 12160b73a8b191316f188b686cc1049bde7012096ef018f4f69a2dfceabc8e7ecc20cf62892deb0d49f5da5b9a642916552b5a2204c54aa7b447c0421bdff1ad SHA512 b1034447c7e08072b06f715c8b7a4a0d4a5b86d8e49f7e8602b0783b335b28505b607d653410fcbe3b98f8a12b5f41a3cbbf20ee486fad0ef266e2461e0cd159
 DIST github.com-miekg-dns-b0dc93d2760ef438612a252a9e448d054d28b625.tar.gz 2731171 BLAKE2B 656ac1df6d4e97d5ee7ad5df45d02c37dbdf48ebaa6f6430b9aeaf835a32aacf4a6ac4855e32849af8c148b4925332be6f37ed65c4a2869f177e24219c1ed0cb SHA512 c0ff9c4c3643dd51272fadbc5e9927b91cf2cc248bea89f0adac81375d6eb3db56cf009183130f72696ef5668ae960130735ca180d5d4136614b0e992671c7cd
+DIST github.com-robertkrimen-otto-15f95af6e78dcd2030d8195a138bd88d4f403546.tar.gz 250931 BLAKE2B 13bb0e6759c8113e74b79aa493d2c44ed606a7819bc0e20f9f7c39471e6e18c7bffb7e606dc2756a6896236885023be4ed20a35899746538dbad549e308b4b8e SHA512 581f2a02313b1951e57f9fb6e8d2462a7a98752c8605f59510ea0c28a413fc1ae0f9d510630779a12dd24ebb66a59216df855df09ebd0b34dddb103df282b5fd
diff --git a/net-analyzer/amass/amass-2.8.7.ebuild b/net-analyzer/amass/amass-2.8.7.ebuild
new file mode 100644
index 000000000..0b16ac833
--- /dev/null
+++ b/net-analyzer/amass/amass-2.8.7.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=(
+	"github.com/asaskevich/EventBus d46933a94f05c6657d7b923fcf5ac563ee37ec79"
+	"github.com/johnnadratowski/golang-neo4j-bolt-driver c68f22031e4222b95e684bf7c4f593ec42ad775a"
+	"github.com/irfansharif/cfilter d07d951ff29d52840ca5e798a17e80db4de8c820"
+	"github.com/miekg/dns b0dc93d2760ef438612a252a9e448d054d28b625"
+	"github.com/fatih/color 2d684516a8861da43017284349b7e303e809ac21"
+	"github.com/go-ini/ini f55231ca73a76c1d61eb05fe0d64a1ccebf93cba"
+
+	"github.com/caffix/cloudflare-roundtripper 4c29d231c9cb6ed0381bd10db5502610a2f59df9"
+	"github.com/dghubble/go-twitter 7ecc41c771b6fe11669159da651b6adf06ee60bf"
+	"github.com/dghubble/sling 7458fd7fa70b9b22f53ffe4a632bd5ae11284a89"
+	"github.com/cenkalti/backoff 62661b46c4093e2c1f38d943e663db1a29873e80"
+	"github.com/google/go-querystring 44c6ddd0a2342c386950e880b658017258da92fc"
+	"github.com/robertkrimen/otto 15f95af6e78dcd2030d8195a138bd88d4f403546"
+	"gopkg.in/sourcemap.v1 6e83acea0053641eff084973fee085f0c193c61a github.com/go-sourcemap/sourcemap"
+)
+
+EGO_PN=github.com/OWASP/Amass
+
+inherit golang-vcs-snapshot
+
+EGIT_COMMIT="${PV}"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz ${EGO_VENDOR_URI}"
+SRC_URI="${ARCHIVE_URI} ${EGO_VENDOR_URI}"
+
+DESCRIPTION="Subdomain OSINT Enumeration"
+HOMEPAGE="https://github.com/OWASP/Amass"
+LICENSE="Apache-2.0"
+SLOT=0
+IUSE=""
+KEYWORDS="~amd64 ~arm ~arm64"
+
+#extraced from go.mod
+DEPEND=">=dev-lang/go-1.10
+	>=dev-go/fetchbot-1.1.2
+	>=dev-go/goquery-1.4.1
+	>=dev-go/cascadia-1.0.0
+	dev-go/robotstxt-go
+	dev-go/go-crypto
+	dev-go/go-net
+	dev-go/go-sys
+	>=dev-go/go-text-0.3.0
+	>=dev-go/go-tools-0_pre20180817
+	dev-go/go-oauth2
+"
+#https://bugs.gentoo.org/673704
+#	dev-go/gopkg-sourcemap
+
+RDEPEND="${DEPEND}"
+
+#src_prepare() {
+#	#https://github.com/OWASP/Amass/issues/52
+#	sed -i "s|caffix/amass|OWASP/Amass|g" src/github.com/OWASP/Amass/cmd/amass.netdomains/main.go
+#	eapply_user
+#}
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+	go install -v -work -x ${EGO_BUILD_FLAGS} ./...
+}
+
+src_install(){
+	dobin bin/amass*
+}
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-go b/profiles/pentoo/base/package.accept_keywords/dev-go
index 4731ee7ef..4ee8ad0a0 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-go
+++ b/profiles/pentoo/base/package.accept_keywords/dev-go
@@ -1,5 +1,7 @@
 #net-analyzer/amass
 =dev-go/go-crypto-0_pre*
+=dev-go/go-oauth2-0_pre*
+dev-go/gopkg-sourcemap
 
 #bettercap
 dev-go/gopacket