diff --git a/dev-python/impacket/Manifest b/dev-python/impacket/Manifest
index 309dedc72..f9c51445f 100644
--- a/dev-python/impacket/Manifest
+++ b/dev-python/impacket/Manifest
@@ -1,3 +1,3 @@
-DIST impacket-0.9.12.tar.gz 965250 SHA256 59cd71e69ac66e6b2905d663e475772f1f94b93b039f929ba3d655a730fbd935 SHA512 1e3e1290990da5701105e038ef59b9c0adc50ae01969c7b2e9d54444dbdfc069895e1e8c1c9602dbaccee9f6b4255cb9160757836b18dfbb34ad5e0174a8f72d WHIRLPOOL 0a973afb816bcab8f8dc3f61b3d85f0cd811a03f253af955aa98add70f013ea22f76f2943b077fb56917bd5d0e11ae46fed2a0d277469de8a86e21f7e9a299d1
-EBUILD impacket-0.9.12-r1.ebuild 642 SHA256 6e1f9fda3b8a07bca70a8f5a69908ba8f18bc6a0e015aa4ed82fde160ca11926 SHA512 febd06babf531a9a7096ad15083b0130ac494f78e9f720a7132b0f6476e0dea82024ddf6c7ce6f1a723e2e6c33fcaa7e41fabf4489026d6429f53ab8509f2227 WHIRLPOOL 8eefb495293cfe9bd6bc047992ff1fa6c98ad1311acc1fa5efa44a7dd098b974d1dfaf825b54bd9f99c312c480377bc562ed40ea0ff1dd46b06a629454838863
-EBUILD impacket-9999.ebuild 596 SHA256 bec81c979b1d437119f36646ee1485c1215a8e1d52b7dca4d3db8e87f532737d SHA512 3f568f941f32603ae30f5355c3f4e518654f512e02a1997f41352a278fb8e382d0fc2a0f12e266229332aa08ceecec007b8026f6e9c4e639d7bec0482663ff94 WHIRLPOOL 747a51cfd306aed28378387070922267a4253db304766c1b08a0e26dee0d0e83f6cd839a11c9f28cb61e50e6bd888724f927c501fe12fc40d2ccbeef73e71fbf
+DIST impacket-0.9.12.tar.gz 975618 SHA256 e5e80d23919e37ff81824ed64701e558295c346f992808e5ab8ef010d0c0a274 SHA512 dc50e78f1d3899d1681856464b0d315cc28ce124f2fa57130a734a9a4716b6ccfcf41c42480da45705adbf55c02aba06c032d0687781e3a075be290a933bb98c WHIRLPOOL 28bb9c9c7f10ac6a837ac2e06f9ec3a8f0ab12a669b47c16988a65df88d3601adab38c4e8c8999ada14848a3874f9c7d96e72097a6d58bf13c2eb29e9c7b2169
+EBUILD impacket-0.9.12-r2.ebuild 950 SHA256 6ec1b6ca86d24750cbe7e7ff2b349398beade36f407c2feba0abae05e7ef13c0 SHA512 36a8c3c889f3402b730b4a60551366fc016b7bec5a839791dee25e9c8076e623cbac79270c4f38a49d44bc34350189116b212e1cb6129ed32343a7b8c11ba7eb WHIRLPOOL acdf21191fd72419bc0452290b0e69b29c9b227f0abef1a285807b99c757bd8c1efa16ad0a6162a43593e6bcc2e0e1a367c1b302aca8968053182e407ccd2895
+EBUILD impacket-9999.ebuild 950 SHA256 6ec1b6ca86d24750cbe7e7ff2b349398beade36f407c2feba0abae05e7ef13c0 SHA512 36a8c3c889f3402b730b4a60551366fc016b7bec5a839791dee25e9c8076e623cbac79270c4f38a49d44bc34350189116b212e1cb6129ed32343a7b8c11ba7eb WHIRLPOOL acdf21191fd72419bc0452290b0e69b29c9b227f0abef1a285807b99c757bd8c1efa16ad0a6162a43593e6bcc2e0e1a367c1b302aca8968053182e407ccd2895
diff --git a/dev-python/impacket/impacket-0.9.12-r1.ebuild b/dev-python/impacket/impacket-0.9.12-r1.ebuild
deleted file mode 100644
index 6504c64e1..000000000
--- a/dev-python/impacket/impacket-0.9.12-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-MY_PN=Impacket
-MY_P=${MY_PN}-${PV}
-
-PYTHON_COMPAT=( python2_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="A collection of Python classes focused on providing access to network packets"
-HOMEPAGE="http://code.google.com/p/impacket"
-SRC_URI="https://pypi.python.org/packages/source/i/impacket/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/pycrypto"
-
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-    nosetests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/impacket/impacket-0.9.12-r2.ebuild b/dev-python/impacket/impacket-0.9.12-r2.ebuild
new file mode 100644
index 000000000..e90f67c35
--- /dev/null
+++ b/dev-python/impacket/impacket-0.9.12-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="A collection of Python classes focused on providing access to network packets"
+HOMEPAGE="https://github.com/CoreSecurity/impacket"
+SRC_URI=""
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/CoreSecurity/impacket.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/CoreSecurity/impacket/archive/impacket_${PV//./_}.tar.gz -> ${P}.tar.gz"
+	inherit versionator
+	S="${WORKDIR}"/${PN}-${PN}_$(replace_all_version_separators _)
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="BSD"
+SLOT="0"
+#IUSE="test"
+IUSE=""
+
+RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+#	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+#python_test() {
+#	nosetests || die "Tests fail with ${EPYTHON}"
+#}
diff --git a/dev-python/impacket/impacket-9999.ebuild b/dev-python/impacket/impacket-9999.ebuild
index 0f3716670..e90f67c35 100644
--- a/dev-python/impacket/impacket-9999.ebuild
+++ b/dev-python/impacket/impacket-9999.ebuild
@@ -4,23 +4,32 @@
 
 EAPI=5
 
-MY_PN=Impacket
-MY_P=${MY_PN}-${PV}
-
-PYTHON_COMPAT=( python2_{6,7} )
-inherit distutils-r1 subversion
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
 
 DESCRIPTION="A collection of Python classes focused on providing access to network packets"
-HOMEPAGE="http://code.google.com/p/impacket"
-ESVN_REPO_URI="http://impacket.googlecode.com/svn/trunk/"
-
+HOMEPAGE="https://github.com/CoreSecurity/impacket"
+SRC_URI=""
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/CoreSecurity/impacket.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/CoreSecurity/impacket/archive/impacket_${PV//./_}.tar.gz -> ${P}.tar.gz"
+	inherit versionator
+	S="${WORKDIR}"/${PN}-${PN}_$(replace_all_version_separators _)
+	KEYWORDS="~amd64 ~x86"
+fi
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
-IUSE="test"
+#IUSE="test"
+IUSE=""
 
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+#	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
-python_test() {
-    nosetests || die "Tests fail with ${EPYTHON}"
-}
+#python_test() {
+#	nosetests || die "Tests fail with ${EPYTHON}"
+#}