diff --git a/app-forensics/volatility/Manifest b/app-forensics/volatility/Manifest
index 2bd2f98ba..aa10ddd80 100644
--- a/app-forensics/volatility/Manifest
+++ b/app-forensics/volatility/Manifest
@@ -1 +1 @@
-DIST volatility-2.6.zip 4179806 SHA256 5b73050d72bf94870ffce22843f03d4b0b7764011dec29ef1a0a5b1b46cf9295 SHA512 1c0b86f270188ba48a6a0ff1d7ad70bde500d0f720d7e1b9d76b6b9498368ae3eb29c5b1c7e7dd76ec9480b83b1e484b4130b4ced7458e4e03ca61fe7d13220f WHIRLPOOL b3432b0725f49c132029102d1f7ba099dffc6c4339ccb5bfaf108d3cf67e3ceb7b221b8e00cc641941af189b74991a51c3fb109819ff8abeb9e8414a49cac6f8
+DIST volatility-2.6.1.tar.gz 5245879 BLAKE2B 3f9d8703c296f412119539b4228649f0e84308a4f2ffcd77efaf944c8f05b32633930d6666ccbdb99085df4ce56e3ff4eac294adf12b8e49ad72bbc70bdc344c SHA512 6b0becfbf4fb30066a0905f797f305e5d9c74dfc7d14378bbd5ad7d8ff2ce4a3b492fff050ab72b7ec87bd57bf6a589a285f04c84c2cd6fa1e6ef61a018d02f5
diff --git a/app-forensics/volatility/volatility-2.6-r1.ebuild b/app-forensics/volatility/volatility-2.6.1.ebuild
similarity index 55%
rename from app-forensics/volatility/volatility-2.6-r1.ebuild
rename to app-forensics/volatility/volatility-2.6.1.ebuild
index 74668be64..545fec8e2 100644
--- a/app-forensics/volatility/volatility-2.6-r1.ebuild
+++ b/app-forensics/volatility/volatility-2.6.1.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Framework for analyzing volatile memory"
-HOMEPAGE="http://www.volatilityfoundation.org/"
-SRC_URI="http://downloads.volatilityfoundation.org/releases/${PV}/${P}.zip"
+HOMEPAGE="https://www.volatilityfoundation.org/"
+SRC_URI="https://github.com/volatilityfoundation/volatility/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-S=${WORKDIR}/${PN}-master
+#S=${WORKDIR}/${PN}-master
 
 DEPEND="app-arch/unzip"
 RDEPEND=">=dev-libs/distorm64-3[${PYTHON_USEDEP}]
@@ -27,9 +27,9 @@ RDEPEND=">=dev-libs/distorm64-3[${PYTHON_USEDEP}]
 
 src_install() {
 	distutils-r1_src_install
-	mkdir "${D}/usr/share/${PN}"
-	mv "${D}/usr/contrib/plugins" "${D}/usr/share/${PN}/"
-	rmdir "${D}/usr/contrib"
-	mv "${D}/usr/tools" "${D}/usr/share/${PN}/"
+	mkdir "${D}/usr/share/${PN}" || die
+	mv "${D}/usr/contrib/plugins" "${D}/usr/share/${PN}/" || die
+	rm -r "${D}/usr/contrib" || die
+	mv "${D}/usr/tools" "${D}/usr/share/${PN}/" || die
 	dosym vol.py /usr/bin/volatility
 }