diff --git a/net-analyzer/owtf/Manifest b/net-analyzer/owtf/Manifest
index 846fb502e..4cf2e04a6 100644
--- a/net-analyzer/owtf/Manifest
+++ b/net-analyzer/owtf/Manifest
@@ -1 +1,2 @@
 DIST owtf-2.4.tar.gz 5721812 BLAKE2B 960e840033119ddff6f378ac0e02fcb893126d46935fd918429ef7d5ff4c225d6b1d77170ed7f3dfcb1a0600e47b653551cf3d4c13a84b5370f345668e528822 SHA512 19dfad8fff9896deaf4793985c89a2e17b32249826ae5d8932d7fe925c14d8e662639414df0bd45be0a367ed1b2023d44f4ac0ca8759c9f006b895968a564f8b
+DIST owtf-2.6.0.tar.gz 3986836 BLAKE2B aac1cdfd67ff2b5c361093b91b5ab3832afab88e2e5948c90aeea9562fae5189fa1b07de3cee19c0511b0cae5293d0bdf1ad28dbfc3964d6f12c33736b4bfa0f SHA512 14ede611ea324ecf94812e5951e665ec409d8398694f08bfa3907a243c71a31652de65a58896b0300c440e0a884a7f13e51e171c0cca1f5d102cf68d8413c837
diff --git a/net-analyzer/owtf/owtf-2.6.0.ebuild b/net-analyzer/owtf/owtf-2.6.0.ebuild
new file mode 100644
index 000000000..b2832c286
--- /dev/null
+++ b/net-analyzer/owtf/owtf-2.6.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+inherit eutils distutils-r1
+
+DESCRIPTION="The Offensive Web Testing Framework"
+HOMEPAGE="https://github.com/owtf/owtf"
+SRC_URI="https://github.com/owtf/owtf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE=""
+SLOT="0"
+#KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	>=dev-python/blinker-1.4[${PYTHON_USEDEP}]
+	>=dev-python/cffi-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/cookies-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-1.15.0[${PYTHON_USEDEP}]
+	>=dev-python/future-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/hrt-0.1.0[${PYTHON_USEDEP}]
+	dev-python/ipaddr[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.6.9[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/psycopg2-binary-2.7.4[${PYTHON_USEDEP}]
+	>=dev-python/PTP-0.4.2[${PYTHON_USEDEP}]
+	>=dev-python/pycurl-7.43.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
+	>=dev-python/PyVirtualDisplay-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
+	>=dev-python/selenium-3.4.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.1.13[${PYTHON_USEDEP}]
+	>=dev-python/tornado-5.0.2[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	rm -r tests/
+#	epatch "${FILESDIR}"/owtf-setup.patch
+	eapply_user
+}
+
+pkg_config() {
+	einfo "If the following fails, it is likely because you forgot to start/config postgresql first"
+	su postgres -c "createuser owtf_db_user -D -S -R"
+	su postgres -c "createdb --owner=owtf_db_user owtfdb"
+}
+
+pkg_postinst() {
+	einfo "To complete the installation, run the following command:"
+	einfo "emerge --config net-analyzer/owtf-2.0a"
+	einfo
+	einfo "You will also need to create a certificate for the current user using the following commands:"
+	einfo "mdkir -p ~/.owtf/proxy/ca.key"
+	einfo "openssl genrsa -des3 -passout pass:owtf_ca_pass -out ~/.owtf/proxy/ca.key 4096"
+	einfo "openssl req -new -x509 -days 3650 -subj \"/C=US/ST=Pwnland/L=OWASP/O=OWTF/CN=MiTMProxy\" -passin pass:owtf_ca_pass -key ~/.owtf/proxy/ca.key -out ~/.owtf/proxy/ca.crt"
+	einfo
+	einfo "In addition, you might want to change owtf_db_user password in the database (currently empty)"
+	einfo "and adjust ~/.owtf/db.cfg accordingly"
+}
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-python b/profiles/pentoo/base/package.accept_keywords/dev-python
index fd7fefc9b..f9e76e99c 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-python
+++ b/profiles/pentoo/base/package.accept_keywords/dev-python
@@ -277,7 +277,7 @@ dev-python/cfscrape
 #required by net-analyzer/owtf
 dev-python/PyVirtualDisplay
 ~dev-python/pyyaml-3.13
-~dev-python/psycopg2-binary-2.7.5
+=dev-python/psycopg2-binary-2.7*
 ~dev-python/PTP-0.4.2
 ~dev-python/selenium-3.13.0
 =dev-python/tornado-5.1*