diff --git a/www-apps/beef/beef-0.5.0.0-r1.ebuild b/www-apps/beef/beef-0.5.0.0-r1.ebuild
index 461d4bfcf..a5e8748df 100644
--- a/www-apps/beef/beef-0.5.0.0-r1.ebuild
+++ b/www-apps/beef/beef-0.5.0.0-r1.ebuild
@@ -19,7 +19,7 @@ LICENSE="AGPL-3"
 #WIP
 #KEYWORDS="~amd64 ~x86"
 
-IUSE="qrcode dns geoip notifications +msf +sqlite"
+IUSE="qrcode dns geoip notifications +msf +sqlite test"
 
 #ruby_add_rdepend "
 
@@ -66,14 +66,9 @@ BDEPEND="${RDEPEND}
 #dns? ( =dev-ruby/rubydns-0.7.3 )
 #qr? ( qr4r )
 
-all_ruby_unpack() {
-	default_src_unpack
-	mv "beef-${P}" "${P}"
-}
-
 #S="${WORKDIR}/all/beef-${P}/"
 
-all_ruby_prepare() {
+src_prepare() {
 #	epatch "${FILESDIR}/0.4.6_unbundler.patch"
 #	rm {Gemfile*,.gitignore,install*,update-beef}
 	rm {.gitignore,install*,update-beef}
@@ -115,15 +110,11 @@ all_ruby_prepare() {
 	sed -i -e "/require 'msgpack'/d" core/loader.rb || die
 
 	default
+	GEM_HOME="${T}" BUNDLE_GEMFILE=Gemfile ruby -S bundle install --local || die
+	GEM_HOME="${T}" BUNDLE_GEMFILE=Gemfile ruby -S bundle check || die
 }
 
-each_ruby_prepare() {
-	addpredict "$(ruby_fakegem_gemsdir)/bundler.lock"
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-	BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-}
-
-each_ruby_install() {
+src_install() {
 	dodir /usr/$(get_libdir)/${PN}
 	cp -R * "${ED}"/usr/$(get_libdir)/${PN} || die "Copy files failed"
 	dobin "${FILESDIR}/beef"
diff --git a/www-apps/beef/files/beef b/www-apps/beef/files/beef
index d588f6882..dcdb5a820 100644
--- a/www-apps/beef/files/beef
+++ b/www-apps/beef/files/beef
@@ -36,5 +36,5 @@ if [ "$?" != "0" ]; then
 fi
 
 #ready to go
-BUNDLE_GEMFILE=~/.beef/Gemfile ${ruby} -S bundle exec /usr/lib/beef/$(basename $0) "$@"
+BUNDLE_GEMFILE=~/.beef/Gemfile ruby -S bundle exec /usr/lib/beef/$(basename $0) "$@"
 #profit