diff --git a/dev-python/scapy-http/Manifest b/dev-python/scapy-http/Manifest
new file mode 100644
index 000000000..c156a69a0
--- /dev/null
+++ b/dev-python/scapy-http/Manifest
@@ -0,0 +1 @@
+DIST scapy-http-1.8.tar.gz 3331 SHA256 fa72d967b7fd82ffbbbf244dc4fda3154a723fd6334006e0f17d4c991b52fa4d SHA512 3f5ea802d776cdb4933ad0e15fd166e25a57bec1930a010364406669d0236279a468b65397b5113d535788a1ea118a190ad04a421325490320e8f98c26786c42 WHIRLPOOL f53e2ba64234e4c2b0a1629f82a585fd4ac2cfb617c5e0839ac5a36beae6beb9bcb3d5ac4ab3df3a376c569aa620050d2fdfc0128bcbe780dc742ac458a586eb
diff --git a/dev-python/scapy-http/scapy-http-1.8.ebuild b/dev-python/scapy-http/scapy-http-1.8.ebuild
new file mode 100644
index 000000000..344c7a5d6
--- /dev/null
+++ b/dev-python/scapy-http/scapy-http-1.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP-layer support for Scapy"
+HOMEPAGE="https://github.com/invernizzi/scapy-http"
+SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/python-scapy[$PYTHON_USEDEP]"
+RDEPEND="${DEPEND}"
+
+#https://github.com/invernizzi/scapy-http/issues/25
+my_install(){
+	insinto $(python_get_sitedir)/scapy/layers
+	doins scapy_http/http.py
+}
+
+src_install(){
+	python_foreach_impl my_install
+}
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
new file mode 100644
index 000000000..8777db4dd
--- /dev/null
+++ b/dev-python/service_identity/Manifest
@@ -0,0 +1 @@
+DIST service_identity-16.0.0.tar.gz 30270 SHA256 0630e222f59f91f3db498be46b1d879ff220955d7bbad719a5cb9ad14e3c3036 SHA512 0ffa28b3dece2415a058ec159e4f85f3e86c0de520ed5d6933ec49edca91ccc79a57893ace40d5441455791433828ab55a939e90335dfdee8582627e33a896ae WHIRLPOOL 598c046bf0e7428d5d3c34e8315bc67a857377af105bddc7d07fde01eaaffb4be62026fdffab6c81eaaff897290ab735c5f3ad3f7f9c4a1bd9f932a39cef9aaf
diff --git a/dev-python/service_identity/service_identity-16.0.0.ebuild b/dev-python/service_identity/service_identity-16.0.0.ebuild
new file mode 100644
index 000000000..08313ab94
--- /dev/null
+++ b/dev-python/service_identity/service_identity-16.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Service identity verification for pyOpenSSL."
+HOMEPAGE="https://service-identity.readthedocs.org/"
+SRC_URI="mirror://pypi/$(echo ${PN} | cut -c 1)/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.12[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]"
+
+#idna; extra == 'idna'
+
+RDEPEND="${DEPEND}"
diff --git a/net-wireless/wifi-pumpkin/Manifest b/net-wireless/wifi-pumpkin/Manifest
index a251ac76d..9fea2ba5b 100644
--- a/net-wireless/wifi-pumpkin/Manifest
+++ b/net-wireless/wifi-pumpkin/Manifest
@@ -1,2 +1,3 @@
 DIST wifi-pumpkin-0.7.8.tar.gz 3210268 SHA256 a84c6421d964e9c5b0afa9bb7f962e9508ddf522884aaa9edb2b0ec53e209159 SHA512 35e8e6040ee87cb4545d587649c75517e0771ba63c40ed5f291c044711c2d29e10bd06e0af4031efc723a671a5a7736eb13d3c0fbf430fc8d4c4782be26a7a8b WHIRLPOOL 7006b40af5e838cf7118bd02f61fa2df043ba4897af5f06119b2ebc7dff303c52e2e824a7a350196ff09f25eeb10125f8c69834ebc4f092f4996e5816e727e35
 DIST wifi-pumpkin-0.8.4.tar.gz 3924775 SHA256 11126abd6b4c70ca5126660d8b9ce6e53eca3196fe334a6cf4c43adb19abc2ec SHA512 9f8c0889cecf4d106d559436940c1e07db26a9f9f06cc78e7eae111838484a1a3aaf49a055b1b3fc8dbd17ac6ae24cbde666b69b4eaf94ccd5543ccb894ced94 WHIRLPOOL bfeb38903988028186f6e22162cbf58a167c13c04c8a8e34aa0f998da0029bf2165f441f53ae37d47f9a0969cee24feedc1b446a0c480c94395e01971b0bf604
+DIST wifi-pumpkin-0.8.5.tar.gz 3855311 SHA256 9190f1fdab97eb842b8f1a757bdf1668c7b355aa3cc1ab2c8bac5068fab1891b SHA512 1dd48a871050f368e1f744ad8174f2c152a3391e6ce61035e2fbf690d08c32f2dff1d8357cd3b1c62cd3592287300e63acba989bc352ef2ebd169f4b07e67b8a WHIRLPOOL 5398ec85863e27cf3efda4d1376c014e534885027e3b37454aa824b435fc7f30a8a9990dca77ce4baaa9f64c3e7980ea8bf8cd6b7c09dbebcd9f753d6369e2c1
diff --git a/net-wireless/wifi-pumpkin/files/0.8.5_checkdeps.patch b/net-wireless/wifi-pumpkin/files/0.8.5_checkdeps.patch
new file mode 100644
index 000000000..766141c4b
--- /dev/null
+++ b/net-wireless/wifi-pumpkin/files/0.8.5_checkdeps.patch
@@ -0,0 +1,28 @@
+--- core/loaders/checker/depedences.py.orig	2017-05-04 21:13:43.000000000 +0800
++++ core/loaders/checker/depedences.py	2017-05-18 08:24:53.654632607 +0800
+@@ -1,7 +1,10 @@
+-#coding: utf-8
++# -*- coding: UTF-8 -*-
++
+ from core.utility.collection import SettingsINI
+-from os import path,popen,remove,system
++from os import path,popen,remove,system,chdir
+ from shutil import copy
++import sys
++
+ YELLOW = '\033[33m'
+ RED = '\033[91m'
+ ENDC = '\033[0m'
+@@ -14,10 +17,8 @@
+     hostapd = popen('which hostapd').read().split('\n')
+     if not path.isfile(hostapd[0]): notinstall('hostapd')
+     # checck source.tar.gz tamplate module
+-    if not path.isfile('templates/Update/Windows_Update/Settins_WinUpdate.html'):
+-        copy('settings/source.tar.gz','templates/')
+-        system('cd templates/ && tar -xf source.tar.gz')
+-        remove('templates/source.tar.gz')
++    if '/usr/sbin/wifi-pumpkin' in sys.argv[0]:
++        chdir('/usr/share/wifi-pumpkin')
+ 
+     # check if hostapd is found and save path
+     settings = SettingsINI('core/config/app/config.ini')
diff --git a/net-wireless/wifi-pumpkin/wifi-pumpkin-0.8.5.ebuild b/net-wireless/wifi-pumpkin/wifi-pumpkin-0.8.5.ebuild
new file mode 100644
index 000000000..9c0b331d1
--- /dev/null
+++ b/net-wireless/wifi-pumpkin/wifi-pumpkin-0.8.5.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="WiFi-Pumpkin"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit python-single-r1 multilib epatch
+
+DESCRIPTION="Framework for Rogue Wi-Fi Access Point Attack"
+HOMEPAGE="https://github.com/P0cL4bs/WiFi-Pumpkin"
+SRC_URI="https://github.com/P0cL4bs/WiFi-Pumpkin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="plugins"
+
+RDEPEND="${PYTHON_DEPS}
+	net-wireless/hostapd
+	net-wireless/rfkill
+	dev-python/PyQt4[${PYTHON_USEDEP}]
+	dev-python/twisted-web[${PYTHON_USEDEP}]
+	net-analyzer/scapy[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/python-nmap[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/config[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	dev-python/isc_dhcp_leases[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/pcapy[${PYTHON_USEDEP}]
+	dev-python/configparser[${PYTHON_USEDEP}]
+	dev-python/netfilterqueue[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/libarchive-c-2.1[${PYTHON_USEDEP}]
+	>=dev-python/python-magic-0.4.8[${PYTHON_USEDEP}]
+	dev-python/pefile[${PYTHON_USEDEP}]
+	dev-python/capstone-python[${PYTHON_USEDEP}]
+	dev-python/hyperframe[${PYTHON_USEDEP}]
+	dev-python/h2[${PYTHON_USEDEP}]
+	=net-proxy/mitmproxy-0.11*[${PYTHON_USEDEP}]
+	dev-python/scapy_http[${PYTHON_USEDEP}]
+	dev-python/service_identity[${PYTHON_USEDEP}]
+
+	plugins? ( net-dns/dnsmasq
+		net-analyzer/driftnet
+		net-analyzer/ettercap
+	)"
+
+#There is a potential with deps due to original requirement:
+#configparser==3.3.0r1
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	#fix check_depen.py file which is full of typos and mistakes
+	epatch "${FILESDIR}"/${PV}_checkdeps.patch
+	sed -i 's|/usr/share/wifi-pumpkin|/usr/'$(get_libdir)'/wifi-pumpkin|g' \
+		core/loaders/checker/depedences.py || die "sed failed"
+	eapply_user
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/${PN}
+	doins -r *
+
+	fperms +x /usr/$(get_libdir)/${PN}/${PN}.py
+	dosym /usr/$(get_libdir)/${PN}/${PN}.py /usr/sbin/${PN}
+
+	python_optimize "${D}"usr/$(get_libdir)/${PN}
+}
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-python b/profiles/pentoo/base/package.accept_keywords/dev-python
index 9787e4d14..1c9ce7db4 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-python
+++ b/profiles/pentoo/base/package.accept_keywords/dev-python
@@ -161,12 +161,15 @@ dev-python/simplesoapy
 
 #wifi-pumpkin
 ~dev-python/isc_dhcp_leases-0.8.1
-~dev-python/python-nmap-0.6.0
+~dev-python/python-nmap-0.6.1
 ~dev-python/config-0.3.9
 ~dev-python/pcapy-0.10.10
 ~dev-python/pygtail-0.7.0
 =dev-python/netfilterqueue-0.8*
 ~dev-python/libarchive-c-2.7
+~dev-python/scapy-http-1.8
+~dev-python/scapy-python3-0.18
+~dev-python/service_identity-16.0.0
 
 # required by net-analyzer/owtf-2.0a::pentoo
 ~dev-python/cookies-2.2.1
diff --git a/profiles/pentoo/base/package.use/net-wireless b/profiles/pentoo/base/package.use/net-wireless
index e4ff01892..ec5069047 100644
--- a/profiles/pentoo/base/package.use/net-wireless
+++ b/profiles/pentoo/base/package.use/net-wireless
@@ -10,3 +10,6 @@ net-wireless/wifite extra dict
 net-analyzer/wireshark lua
 net-wireless/wpa_supplicant ap eap-sim uncommon-eap-types tdls p2p wps
 net-wireless/soapysdr bladerf hackrf rtlsdr uhd
+
+~net-wireless/wifi-pumpkin-0.8.5 -python_targets_python3_4 -python_targets_python3_5
+dev-python/scapy_http  -python_targets_python3_4 -python_targets_python3_5
diff --git a/virtual/python-scapy/python-scapy-1.ebuild b/virtual/python-scapy/python-scapy-1.ebuild
new file mode 100644
index 000000000..16962aeb5
--- /dev/null
+++ b/virtual/python-scapy/python-scapy-1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit python-r1
+
+DESCRIPTION="A virtual for scapy, for Python 2 & 3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+#REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="^^ ( python_targets_python2_7 python_targets_python3_4 )"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'net-analyzer/scapy[${PYTHON_USEDEP}]' python2*)
+	$(python_gen_cond_dep 'dev-python/scapy-python3[${PYTHON_USEDEP}]' python3*)"
+DEPEND=""