diff --git a/app-forensics/libbfio/Manifest b/app-forensics/libbfio/Manifest
index a65f71d97..2731e1ded 100644
--- a/app-forensics/libbfio/Manifest
+++ b/app-forensics/libbfio/Manifest
@@ -1,6 +1,4 @@
-DIST libbfio-alpha-20110625.tar.gz 664656 SHA256 d90d4baf98b61f9f330e097fae2eadf0253d40e3a910154364a21d1710c441de
-DIST libbfio-alpha-20110830.tar.gz 673836 SHA256 944b9cfc70b2ff03a4b7dd989b6aad16ef65aef5bd052e0a385510fab308a5eb
 DIST libbfio-alpha-20120425.tar.gz 1569560 SHA256 5b645f9a1da7dc96fcb0ca778c7a5c9f4bcefa95bbdda0786883007cd1497070 SHA512 058d5018202c404d789531f308b66d9e72924f4ce9d6365477c84a327a3fe2a4efb9cd0cc173f29dbf2d18cf366772e5577ffea6d0953b752865cbdf4da48c20 WHIRLPOOL 76adf2d5baaa27d86eb5024d9a1e2394323809f8f1f5fa4e3e72f703ccbadf8f81c4778b0ddfec1aa935d81133a5cea279ed33e36b1569ed1f89948a6fa5eca7
-EBUILD libbfio-0.0.20110625_alpha.ebuild 702 SHA256 ec4de5f898076323135fbbbc87abdf13e88c73f43d8c4d4ab65887c5f3567836 SHA512 d52c48037b3ffb6e82eec2659640e4cb843b49870556446d3a3571002b546d46054e71d7849cc848547cdb804c9152ec4226e422adce152637bcc4e2c647536e WHIRLPOOL 46e6d9c486828de21cdbcab0688c1e7b0dd16c3897e31eb0a7fe56c8812c64dcf5a213b8ccbea1938f2977f9bbb7cdab7e1d0516f8b15cd2460fb441f7354f13
-EBUILD libbfio-0.0.20110830_alpha.ebuild 702 SHA256 ec4de5f898076323135fbbbc87abdf13e88c73f43d8c4d4ab65887c5f3567836 SHA512 d52c48037b3ffb6e82eec2659640e4cb843b49870556446d3a3571002b546d46054e71d7849cc848547cdb804c9152ec4226e422adce152637bcc4e2c647536e WHIRLPOOL 46e6d9c486828de21cdbcab0688c1e7b0dd16c3897e31eb0a7fe56c8812c64dcf5a213b8ccbea1938f2977f9bbb7cdab7e1d0516f8b15cd2460fb441f7354f13
-EBUILD libbfio-0.0.20120425_alpha.ebuild 671 SHA256 ec87fdcb1709b0ebb40a4d5c9e6606335ecef2d5608c29ecce837096282b422e SHA512 8b938b19ad385f4681e73784985f4969844d991ab2b264ce250430476cb501bd939a31d5d3c66e56ebd2f45316cc34e28df7bdee75180df019f573592bcac4ed WHIRLPOOL 658788bba7d8ff8bf85f1affc6a94183ba205d3551acfc605cdb51e614a35ae4919a1a4038ea3786fb17987d77b8814a5988e041e159264624cba6238f139fb8
+DIST libbfio-alpha-20130609.tar.gz 1858612 SHA256 bf90af77d6894ff91d9973c33c0a5a63accea454b9e601275c7c52f578203dd4 SHA512 b2f46c7631aa8dca63d6e915c69ba6136f0f777f138708c4751e24f3e96a2399721182ce281e032b617b17ce631876cefb8ef686b9bd1cb866f9f1033d1dd18b WHIRLPOOL 438f9c48d2da78649bb9a0a5d12f5d66a2b695dd5816bc5bd5e063f02df171abd05c46e16db70da664de830202f988ca4c009e1cd747365a834728a60e414d52
+EBUILD libbfio-0.0.20120425_alpha.ebuild 672 SHA256 3f30e2c1e631500e29fea8fc321e272d98145d746421e385557e25c75cf5c344 SHA512 de835da62e68608db76d36cac68cc5f652deca2876e1002bb3a05e1a5aafe3db88c417e89dfa9d0d6e345ac48674ba71bb802cfcca5c0b04eb12cb1a39ab7fd4 WHIRLPOOL c8f7c831b51042f01c2537920e912586e725a40d23b0a980e337f5fabc8cf0c8b58c54c4601e077f217491baaa357ce28ba35b87201394969afc1666922b544b
+EBUILD libbfio-0.0.20130609_alpha.ebuild 675 SHA256 69494e31155e0682987d91709c08a1710d5c2823c507220201dfad597edd0152 SHA512 4193e1cf96fe7fd089aa170167664e81f117f1990ca2b1a2a69422349be1d721982e1b4f08a47efebe054ac7417f1d009c842b4b180c17c4fd9de049eb029de2 WHIRLPOOL 97ed710204c6608d01645916e75e3620d1e45aab026ada0614f367b218473158d241d81cead6f3045dfce454df90313bc60f7cc7fb48bd38668680a68111057f
diff --git a/app-forensics/libbfio/libbfio-0.0.20110830_alpha.ebuild b/app-forensics/libbfio/libbfio-0.0.20110830_alpha.ebuild
deleted file mode 100644
index bce814893..000000000
--- a/app-forensics/libbfio/libbfio-0.0.20110830_alpha.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit versionator
-
-MY_DATE="$(get_version_component_range 3)"
-
-DESCRIPTION="Library for providing a basic file input/output abstraction layer."
-HOMEPAGE="http://sf.net/projects/libbfio"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-alpha/${PN}-alpha-${MY_DATE}/${PN}-alpha-${MY_DATE}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="unicode"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_DATE}"
-
-src_configure() {
-	econf $(use_enable unicode wide-character-type)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "Failed to install"
-}
diff --git a/app-forensics/libbfio/libbfio-0.0.20120425_alpha.ebuild b/app-forensics/libbfio/libbfio-0.0.20120425_alpha.ebuild
index ebc62b19b..427117d60 100644
--- a/app-forensics/libbfio/libbfio-0.0.20120425_alpha.ebuild
+++ b/app-forensics/libbfio/libbfio-0.0.20120425_alpha.ebuild
@@ -10,7 +10,7 @@ MY_DATE="$(get_version_component_range 3)"
 
 DESCRIPTION="Library for providing a basic file input/output abstraction layer."
 HOMEPAGE="http://code.google.com/p/libbfio/"
-SRC_URI="http://libbfio.googlecode.com/files/${PN}-alpha-${MY_DATE}.tar.gz"
+SRC_URI="http://dev.pentoo.ch/~zero/distfiles/${PN}-alpha-${MY_DATE}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/app-forensics/libbfio/libbfio-0.0.20110625_alpha.ebuild b/app-forensics/libbfio/libbfio-0.0.20130609_alpha.ebuild
similarity index 63%
rename from app-forensics/libbfio/libbfio-0.0.20110625_alpha.ebuild
rename to app-forensics/libbfio/libbfio-0.0.20130609_alpha.ebuild
index bce814893..04990f150 100644
--- a/app-forensics/libbfio/libbfio-0.0.20110625_alpha.ebuild
+++ b/app-forensics/libbfio/libbfio-0.0.20130609_alpha.ebuild
@@ -2,19 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=5
 
 inherit versionator
 
 MY_DATE="$(get_version_component_range 3)"
 
 DESCRIPTION="Library for providing a basic file input/output abstraction layer."
-HOMEPAGE="http://sf.net/projects/libbfio"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-alpha/${PN}-alpha-${MY_DATE}/${PN}-alpha-${MY_DATE}.tar.gz"
+HOMEPAGE="http://code.google.com/p/libbfio/"
+SRC_URI="http://dev.pentoo.ch/~zero/distfiles/${PN}-alpha-${MY_DATE}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="unicode"
 
 DEPEND=""
@@ -26,6 +26,6 @@ src_configure() {
 	econf $(use_enable unicode wide-character-type)
 }
 
-src_install() {
-	emake install DESTDIR="${D}" || die "Failed to install"
-}
+#src_install() {
+#	emake install DESTDIR="${D}" || die "Failed to install"
+#}
diff --git a/profiles/pentoo/base/package.accept_keywords/app-forensics b/profiles/pentoo/base/package.accept_keywords/app-forensics
index d9536cb68..50212c713 100644
--- a/profiles/pentoo/base/package.accept_keywords/app-forensics
+++ b/profiles/pentoo/base/package.accept_keywords/app-forensics
@@ -4,7 +4,7 @@
 ~app-forensics/galleta-20040505_p1
 
 ~app-forensics/dff-1.2.0
-~app-forensics/libbfio-0.0.20120425_alpha
+app-forensics/libbfio
 ~app-forensics/libpff-0.0.20120802_alpha
 
 ~app-forensics/inception-0.2.4