diff --git a/net-analyzer/nmap_vulscan/Manifest b/net-analyzer/nmap_vulscan/Manifest
index 67345b137..905b16455 100644
--- a/net-analyzer/nmap_vulscan/Manifest
+++ b/net-analyzer/nmap_vulscan/Manifest
@@ -1,2 +1,2 @@
-DIST nmap_nse_vulscan-2.0.tar.gz 8612788 BLAKE2B 164dccc1bdc421794a7e5f62fee765ee3bcf5ebdf529d82364c94572a00caf2e0a5658f9d15d5615a254ae16dbb7520339f8dd7ba66930ab0060c718e9ea2302 SHA512 d5c45316a0c16600e32b9220948424c84df6c002f5ba3cddc9a04368c183a29adda0a3ee98386f1955e083dfc1d35b366604182f37b91bb1801506feb43dc013
 DIST nmap_vulscan-2.0_p20190923.tar.gz 11253401 BLAKE2B 6acafbac86daee5b435a5fd7cc51db08854684ac5c76dbc285a8c073384a461d369f6da1fa14e842f29f3fb232407b155d25d0f326563b8dfc4c6239f8af5591 SHA512 7a8fa4777d486ebc9a144af3c27635b94b27d0d06705b5fec141e5b8f0dfaea2ec6c0122fe4f3434c46eebceca4217fc545fb68751cdbab95b83b378a8b165bb
+DIST nmap_vulscan-2.1.tar.gz 11253091 BLAKE2B 03bd335754d1da9e4d70395a53e4b1da9b713414e85e435798353450872146e4b38ab68e24c0b68a34cb74b17f83efd3594eb3f3e8d70627e983fb96408798d2 SHA512 678edd3a147697b841e9b8810dbb2d460fc3e127ef8717bd96e420402c4dea087afee398ee4fe2d6dcb7462553544a21ece4442a098a7f1c3be0a8d91c18f19f
diff --git a/net-analyzer/nmap_vulscan/nmap_vulscan-2.0_p20170503.ebuild b/net-analyzer/nmap_vulscan/nmap_vulscan-2.0_p20170503.ebuild
deleted file mode 100644
index 9cdd05ad6..000000000
--- a/net-analyzer/nmap_vulscan/nmap_vulscan-2.0_p20170503.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit git-r3
-
-DESCRIPTION="A NSE vulnerability scanner which uses an offline version of scip VulDB"
-HOMEPAGE="http://www.computec.ch/projekte/vulscan/"
-EGIT_REPO_URI="https://github.com/scipag/vulscan.git"
-EGIT_COMMIT="c1bd1a7470132db9fa7179153a756716dadbe3ea"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm"
-
-DEPEND=""
-RDEPEND="net-analyzer/nmap[nse]"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/nmap/scripts/vulscan
-	doins -r * || die "install failed"
-}
diff --git a/net-analyzer/nmap_vulscan/nmap_vulscan-2.0_p20171214.ebuild b/net-analyzer/nmap_vulscan/nmap_vulscan-2.0_p20171214.ebuild
deleted file mode 100644
index 28c20bbf6..000000000
--- a/net-analyzer/nmap_vulscan/nmap_vulscan-2.0_p20171214.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit git-r3
-
-DESCRIPTION="A NSE vulnerability scanner which uses an offline version of scip VulDB"
-HOMEPAGE="http://www.computec.ch/projekte/vulscan/"
-EGIT_REPO_URI="https://github.com/scipag/vulscan.git"
-EGIT_COMMIT="cdb92c8cf816ddefecced16c84607bb1f247447e"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm"
-
-DEPEND=""
-RDEPEND="net-analyzer/nmap[nse]"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/nmap/scripts/vulscan
-	doins -r * || die "install failed"
-}
diff --git a/net-analyzer/nmap_vulscan/nmap_vulscan-2.0_p20190923.ebuild b/net-analyzer/nmap_vulscan/nmap_vulscan-2.0_p20190923.ebuild
index b8fc7135b..9fd836cc3 100644
--- a/net-analyzer/nmap_vulscan/nmap_vulscan-2.0_p20190923.ebuild
+++ b/net-analyzer/nmap_vulscan/nmap_vulscan-2.0_p20190923.ebuild
@@ -1,20 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-#inherit git-r3
-#EGIT_COMMIT="6beff39b5cc0f7a84c3cd0fe716f75b6f26b4ee8"
 HASH_COMMIT="6beff39b5cc0f7a84c3cd0fe716f75b6f26b4ee8"
 
 DESCRIPTION="A NSE vulnerability scanner which uses an offline version of scip VulDB"
 HOMEPAGE="http://www.computec.ch/projekte/vulscan/"
-#EGIT_REPO_URI="https://github.com/scipag/vulscan.git"
 SRC_URI="https://github.com/scipag/vulscan/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND=""
 RDEPEND="net-analyzer/nmap[nse]"
diff --git a/net-analyzer/nmap_vulscan/nmap_vulscan-2.0-r1.ebuild b/net-analyzer/nmap_vulscan/nmap_vulscan-2.1.ebuild
similarity index 73%
rename from net-analyzer/nmap_vulscan/nmap_vulscan-2.0-r1.ebuild
rename to net-analyzer/nmap_vulscan/nmap_vulscan-2.1.ebuild
index 6e3777f81..73bca550e 100644
--- a/net-analyzer/nmap_vulscan/nmap_vulscan-2.0-r1.ebuild
+++ b/net-analyzer/nmap_vulscan/nmap_vulscan-2.1.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="A NSE vulnerability scanner which uses an offline version of scip VulDB"
 HOMEPAGE="http://www.computec.ch/projekte/vulscan/"
-SRC_URI="http://www.computec.ch/projekte/vulscan/download//nmap_nse_vulscan-${PV}.tar.gz"
+SRC_URI="https://github.com/scipag/vulscan/archive/${PV}.tar.gz -> ${P}.tar.gz"
 #updated db at http://www.computec.ch/projekte/vulscan/download/scipvuldb.csv
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 arm"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND=""
 RDEPEND="net-analyzer/nmap[nse]"
@@ -19,6 +18,7 @@ RDEPEND="net-analyzer/nmap[nse]"
 S="${WORKDIR}"
 
 src_install() {
+	rm -r utilities
 	insinto /usr/share/nmap/scripts/vulscan
 	doins -r * || die "install failed"
 }