diff --git a/dev-python/nassl/Manifest b/dev-python/nassl/Manifest
index 99e6c62cd..9a858d4a7 100644
--- a/dev-python/nassl/Manifest
+++ b/dev-python/nassl/Manifest
@@ -2,6 +2,9 @@ DIST nassl-0.17.0.tar.gz 3665705 BLAKE2B e1b2813117e341381fb30f4ada802ddeb3a6546
 DIST nassl-1.0.3.tar.gz 7295365 BLAKE2B f176b554563ab4aacc3c1c6c9b4e55951aa6bb19086c7802871b396b3ff3aa6f5bec48fbde201334725021cead2f7d72a17ad543c8ad3023bd49ae4e9a9ff548 SHA512 b144c4badf9b7efc98c20f84a2cd20d5e11943a6fe81640af69a1daf2959a4542e107b852f3af015ad67f49ad8a7122f70ce7dad4778eac4a563517c9e6c2880
 DIST nassl-1.1.0.tar.gz 8742631 BLAKE2B 773bcbee7464d9cda4cbcd228ab747fd3c460180e8a3b243313faf8ff2941e082e2590abe8a97eade08c92abfe12895dc9b2d0de04c067c92341776be7e78ed1 SHA512 cf2a9a6dc34e3b2a2b8b268e54bf902a454328f873e064d4a6c783c7e3e93e3083b5e15eb1819a50d591003b8dc0c9698d197b49790bb3e407f18eb6863a9ac2
 DIST nassl-1.1.3.tar.gz 1995462 BLAKE2B 706969ba9ef9e171c42d35e1a6fb81b4b0114763cd95aabc8f941758314d4233fa272fd3facf43a2604e82489be01d9bbfd4a1d76e7437fd9bec68bb8c8512e8 SHA512 4c31c2c626f7aa36b9e39a9b1772f94addf818b4d63aaa5fa7f4d3188fa72af7beec653ea3628c1ce42d062c09b67fe90ad2667bb08468cb4b1e4b2c85929f5c
+DIST nassl-2.1.0.tar.gz 207482 BLAKE2B fb7b8602c5537110ca888dc77ef1037458c5b3b6dccf2104aae82893ee1d27030a9488f60251c623902e4dfa6c92cd5123a8becafab01f87470d19cdfe681d10 SHA512 aa3cc1d7201c25b530180f2c74a3f204c55f68e1392ff38599494bdc38d073c4b2dea01a9193853c1310064965ef9c55e6a08ce5b49f43ecdc0282b876f8aa46
 DIST openssl-1.0.2e.tar.gz 5256555 BLAKE2B ef501f5e86857b1bb0ff0a28468bdff07010bc76801d15851adf7ca28e174d552f580b04a02d068a9e4f0d3da51abdf8ddeb9f37dd31e1445720bb9ed73c6bc1 SHA512 b73f114a117ccab284cf5891dac050e3016d28e0b1fc71639442cdb42accef676115af90a12deff4bcc1f599cc0cbdeb38142cbf4570bd7d03634786ad32c95f
 DIST openssl-1f5878b8e25a785dde330bf485e6ed5a6ae09a1a.zip 18391488 BLAKE2B 999c74b137207b6a5c2696625c0c20477cf875a0ab4f840f47fb024846afd911dd7d2ff0601235b330ea3708218e4e787af91b6b7c9ac74f5c0bb58c61e655c3 SHA512 1fb593167358b0eaddf09d82f4ba6e1e0836813d13296b41b47d7f7fe71a7fe8326639ac91050cba69c77b6f268b83a98beea272ff2da0aaf0d092a8539f2978
+DIST openssl-OpenSSL_1_0_2e.zip 7242974 BLAKE2B c3e2a67d60067416627d0b61e4ee465488f329e1e9730ffe9980cc075caf583021ed3439d4fc1a504e039504f4b828b144a6673155171cb088ccc80fb8b8f222 SHA512 96ec9e8eff65387238ca523b7e5b3d330098a446af86ec1772e24eda99e63ef28364b5fa32e89f4dad2a38f07da9dd2a53f93eacf8040f94e93f03297f4a0508
+DIST openssl-OpenSSL_1_1_1-pre9.zip 19726750 BLAKE2B 63ddf944d4e58b4d1b7efb971f67de3b5daacb09a553082e5f21cceb908db99168c4d42471c0583bba1348037ddb6e103d12cbbaa7d685b8fda71e0991062b56 SHA512 fa05d51adadff802aceeff6f348f913eab631b630ef69f3da6dffaf76be6e01323911ae241b1a3f88519917f017acdb033425bbf1864168cb0c58dd3b46a0c44
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
diff --git a/dev-python/nassl/files/no_fetch.patch b/dev-python/nassl/files/no_fetch.patch
new file mode 100644
index 000000000..8de68e08f
--- /dev/null
+++ b/dev-python/nassl/files/no_fetch.patch
@@ -0,0 +1,20 @@
+--- a/nassl-2.1.0/build_tasks.py.orig	2018-08-27 11:24:25.000000000 +0800
++++ b/nassl-2.1.0/build_tasks.py	2018-08-29 09:56:49.248986644 +0800
+@@ -79,16 +79,7 @@
+     def fetch_source(self) -> None:
+         """Download the tar archive that contains the source code for the library.
+         """
+-        import requests  # Do not import at the top that this file can be imported by setup.py
+-        with TemporaryFile() as temp_file:
+-            # Download the source archive
+-            request = requests.get(self.src_tar_gz_url)
+-            temp_file.write(request.content)
+-            # Rewind the file
+-            temp_file.seek(0)
+-            # Extract the content of the archive
+-            tar_file = tarfile.open(fileobj=temp_file)
+-            tar_file.extractall(path=_DEPS_PATH)
++        pass
+ 
+     @abstractmethod
+     def build(self, ctx: Context) -> None:
diff --git a/dev-python/nassl/nassl-2.1.0.ebuild b/dev-python/nassl/nassl-2.1.0.ebuild
new file mode 100644
index 000000000..b099aecb4
--- /dev/null
+++ b/dev-python/nassl/nassl-2.1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit eutils distutils-r1 flag-o-matic
+
+#something to investigate in https://github.com/nabla-c0d3/sslyze/issues/101
+#can system packages be used?
+MY_OPENSSL_MODERN="OpenSSL_1_1_1-pre9"
+MY_OPENSSL_LEGACY="OpenSSL_1_0_2e"
+MY_ZLIB="zlib-1.2.11"
+
+DESCRIPTION="Experimental Python wrapper for OpenSSL"
+HOMEPAGE="https://github.com/nabla-c0d3/nassl"
+SRC_URI="https://github.com/nabla-c0d3/nassl/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/openssl/openssl/archive/${MY_OPENSSL_LEGACY}.zip -> openssl-${MY_OPENSSL_LEGACY}.zip
+	https://github.com/openssl/openssl/archive/${MY_OPENSSL_MODERN}.zip -> openssl-${MY_OPENSSL_MODERN}.zip
+	http://zlib.net/${MY_ZLIB}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/python-typing[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	dev-python/invoke[${PYTHON_USEDEP}]"
+#test? pytest
+#mypy
+#flake8
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare(){
+	epatch "${FILESDIR}/no_fetch.patch"
+	mkdir deps
+	ln -s "${WORKDIR}/openssl-${MY_OPENSSL_LEGACY}" "${S}/deps"
+	ln -s "${WORKDIR}/openssl-${MY_OPENSSL_MODERN}" "${S}/deps"
+	ln -s "${WORKDIR}/${MY_ZLIB}" "${S}/deps"
+
+	invoke build.zlib
+	invoke build.legacy-openssl
+	invoke build.modern-openssl
+
+	eapply_user
+}
diff --git a/net-analyzer/sslyze/Manifest b/net-analyzer/sslyze/Manifest
index d3afc43b3..6db6c01d6 100644
--- a/net-analyzer/sslyze/Manifest
+++ b/net-analyzer/sslyze/Manifest
@@ -1 +1,2 @@
 DIST sslyze-1.4.3.tar.gz 2609633 BLAKE2B 25519f5aa2a64d8ff2bee967255b639a1ca40651c9b70bf561a334a832c3274448b225bd03346ed7446827f39f6a7cde671e6cf5cec02d3095eb6edbb3fde317 SHA512 e57cbfbf15d7d4138e29ef0c33c04bf034853bbe80c5bf34ebe1631deb22b29b4ce593f6f1ab73a5a154feb87b4c566f35e66de79a3cf03e44721aaf728fa519
+DIST sslyze-2.0.0.tar.gz 9664964 BLAKE2B 2e6e938abc8936d4d189544fca8306383538741dc56ad2c887fa1bd1607831b0c8c9bc2b6fd812cf6e3ee3cbdf053863e507df0a3d0479320356e544990d7b2d SHA512 faa7903e5886e8d262147861917283af36a5932963f1a214cb161fee7178bf03f07785e587ac9011b556f1138a46f75bc5658be6b0ce3b35e0d455af94213eb6
diff --git a/net-analyzer/sslyze/sslyze-2.0.0.ebuild b/net-analyzer/sslyze/sslyze-2.0.0.ebuild
new file mode 100644
index 000000000..195d013c7
--- /dev/null
+++ b/net-analyzer/sslyze/sslyze-2.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Fast and full-featured SSL scanner"
+HOMEPAGE="https://github.com/nabla-c0d3/sslyze"
+SRC_URI="https://github.com/nabla-c0d3/sslyze/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="=dev-python/nassl-2.1*[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
+	>=dev-python/tls_parser-1.2.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	virtual/python-typing[${PYTHON_USEDEP}]"
+
+src_prepare(){
+	rm -r tests
+	eapply_user
+}
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-python b/profiles/pentoo/base/package.accept_keywords/dev-python
index a4c4864d8..9fbc8ec56 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-python
+++ b/profiles/pentoo/base/package.accept_keywords/dev-python
@@ -69,10 +69,11 @@ dev-python/simplesoapy
 =dev-python/ntlm-auth-1*
 
 #sslyze
-=dev-python/nassl-1.1*
+=dev-python/nassl-2.1*
 =dev-python/tls_parser-1.2*
-=dev-python/cryptography-2.1*
-=dev-python/cryptography-2.2*
+=dev-python/cryptography-2.3*
+#nassl
+=dev-python/invoke-1.1*
 
 #gplaycli
 =dev-python/androguard-3.2*
diff --git a/profiles/pentoo/base/package.accept_keywords/net-analyzer b/profiles/pentoo/base/package.accept_keywords/net-analyzer
index d4cf93d87..a53bb97c9 100644
--- a/profiles/pentoo/base/package.accept_keywords/net-analyzer
+++ b/profiles/pentoo/base/package.accept_keywords/net-analyzer
@@ -92,7 +92,7 @@ net-analyzer/nmap
 net-analyzer/snort
 ~net-analyzer/sslsniff-0.8
 ~net-analyzer/sslstrip-0.9
-=net-analyzer/sslyze-1.4*
+=net-analyzer/sslyze-2.0*
 =net-analyzer/sslscan-1.11*
 ~net-analyzer/subdomainer-1.3
 ~net-analyzer/tcpdump-4.3.0