diff --git a/app-forensics/libvshadow/Manifest b/app-forensics/libvshadow/Manifest
index 94d56b931..8276d6641 100644
--- a/app-forensics/libvshadow/Manifest
+++ b/app-forensics/libvshadow/Manifest
@@ -1,4 +1,2 @@
-DIST libvshadow-alpha-20130509.tar.gz 1298150 SHA256 c611bd2de28711777664eb2dbc1e891bac38d336e2070743f93445c45a0ad5fd SHA512 acfc4d02cd7e1ca46c087acef78a84c2e0fc4ca8fae3fc702287a2332adbf82b7d026afba91e9d7703f998a6ae3606595f6b9e0389e14f9149f1cf88709201a8 WHIRLPOOL 52902a3c9b72bb9508fe70c11f05dc12e0833a0f675c59bcf63c4310a6a4ef333796fd4bb21b42a054733374d3398aa1363ad6a73c68f204baf8a38ecef40a6d
-DIST libvshadow-alpha-20130721.tar.gz 1297333 SHA256 204020f883eab0ec3f63df627655b6ef51e9fb9f693a3e8adc6f2fc3c15912f4 SHA512 1e1f33d41e744490af84f2783bae03d704e6956cf0ad82c4cfa02e9db78b22ecc04e53e10fcd48db615e395d5261ee59f8cfd7f773b88ca0845cac8c4aff8b56 WHIRLPOOL 5c51525689b8a7ee76f3a2ffe5d2b480c8fafe090705ad6028f9420916807b2b03edcda664e5b23bcb2380e9faf905e3a4ea81027acc33d36dfdea1702a90922
-EBUILD libvshadow-0.0.20130509_alpha-r1.ebuild 800 SHA256 60479bec57cfc171d4de9f0de44574829b8cd05bc2ea40e632583c515454105b SHA512 c0c7ed21406e8659cab4225d72b3c0a6e654c672bf4d6a103824f290a3708271aff52e723ba6c16e085b1963d4391b6d96a9be9939de8643b9bcb970a312def9 WHIRLPOOL 6f3e7c9dad691d99a0666d8a6947431a4af7a83f5db73081ef14686dcc5680cbd0c6fd7c421cdb75d48b548b057f2c6d57b48c76c3336f8e10a3e21a4ef6373a
-EBUILD libvshadow-0.0.20130721_alpha.ebuild 704 SHA256 324fdcfabf2f4f7815c3e845e0968bb288760e4731312dbfbb3e5a1bfd7e5609 SHA512 eeb4beb796048fc399445965db2360cd992f3f6b93b990552480e4a42d91071e9e7ea0f7a41df80c6753c8a2c0f4a69fdf314d5c7c6c71da3e8602218ce0b98d WHIRLPOOL 87a7637f47bc959893c31976617b1d4d720321f87218d9b7647e5fd7be0e59b803c30b97f9f5829788fa63e79f227351663802a2b7b918a6b0ce654d02f260ed
+DIST libvshadow-alpha-20131209.tar.gz 1304536 SHA256 e5dd1890c62b0921646edfde53aa8f0bb65314aa12012ae68a90d4c7ea1a314d SHA512 a474dd98988025174167f3912585d32a7966a19e823df27cfa81ce54ddcd222fca5311536808a3a63bf0227936224134d6041d9b118a36c95bee8c39bd0489a6 WHIRLPOOL 776ad5e47a2bdd60a0d747b291ba788ca3f98f41ccde9b14f4f3a91e667f32dd63b15fea7b3092ae48704f791f9c1ec6e6d319954c0b868764f7cf421443ce92
+EBUILD libvshadow-0.0.20131209_alpha.ebuild 733 SHA256 a66cff5c97e08030655f3a8c5c6e33e01e2908922885c9c2ea094f874c141183 SHA512 44290c87b93d70ef0ebcd3f4c9cffc501d09588359958640129326c1145157ab774c4647842d9308a6137e65281a45027bdf4605fd3637d1212a8afaebeac6c4 WHIRLPOOL 16b1ff187e8bf4d048b5d1d79ea80248b6b0be1271e75e3e7c8a1d57a4c37dc071f26130ae1547a24cb860c97505143631a706aba4cc92ffd029832c2bbc0d5e
diff --git a/app-forensics/libvshadow/libvshadow-0.0.20130509_alpha-r1.ebuild b/app-forensics/libvshadow/libvshadow-0.0.20130509_alpha-r1.ebuild
deleted file mode 100644
index 724801874..000000000
--- a/app-forensics/libvshadow/libvshadow-0.0.20130509_alpha-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_DEPEND="2"
-
-inherit versionator python
-MY_DATE="$(get_version_component_range 3)"
-
-DESCRIPTION="Library and tools to support the Volume Shadow Snapshot (VSS) format."
-HOMEPAGE="http://code.google.com/p/libvshadow/"
-#SRC_URI="http://libvshadow.googlecode.com/files/${PN}-alpha-${MY_DATE}.tar.gz"
-SRC_URI="http://dev.pentoo.ch/~blshkv/distfiles/${PN}-alpha-${MY_DATE}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="python"
-
-DEPEND="<app-forensics/libbfio-0.0.20120426"
-RDEPEND="${DEPEND}
-	sys-fs/fuse"
-
-S="${WORKDIR}/${PN}-${MY_DATE}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_configure() {
-	econf $(use_enable python)
-}
diff --git a/app-forensics/libvshadow/libvshadow-0.0.20130721_alpha.ebuild b/app-forensics/libvshadow/libvshadow-0.0.20131209_alpha.ebuild
similarity index 70%
rename from app-forensics/libvshadow/libvshadow-0.0.20130721_alpha.ebuild
rename to app-forensics/libvshadow/libvshadow-0.0.20131209_alpha.ebuild
index a493c6e28..10a2d3ebe 100644
--- a/app-forensics/libvshadow/libvshadow-0.0.20130721_alpha.ebuild
+++ b/app-forensics/libvshadow/libvshadow-0.0.20131209_alpha.ebuild
@@ -4,14 +4,14 @@
 
 EAPI=5
 
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python2_{6,7} )
+inherit versionator python-single-r1
 
-inherit versionator python
 MY_DATE="$(get_version_component_range 3)"
 
 DESCRIPTION="Library and tools to support the Volume Shadow Snapshot (VSS) format."
 HOMEPAGE="http://code.google.com/p/libvshadow/"
-SRC_URI="http://dev.pentoo.ch/~zero/distfiles/${PN}-alpha-${MY_DATE}.tar.gz"
+SRC_URI="http://dev.pentoo.ch/~blshkv/distfiles/${PN}-alpha-${MY_DATE}.tar.gz http://dev.pentoo.ch/~zero/distfiles/${PN}-alpha-${MY_DATE}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
@@ -24,11 +24,6 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${PN}-${MY_DATE}"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_configure() {
 	econf $(use_enable python)
 }