diff --git a/common/shlibs b/common/shlibs
index 3aabcb2c1d..d27350c9c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -401,6 +401,7 @@ libcdio.so.16 libcdio-0.93_1
 libmpcdec.so.5 libmpcdec-1.2.6_1
 libproxy.so.1 libproxy-0.4.6_1
 libmodman.so.1 libproxy-0.4.6_1
+libmoar.so moarvm-2015.02_2
 libFLAC.so.8 libflac-1.2.1_1
 libFLAC++.so.6 libflac-1.2.1_1
 libmad.so.0 libmad-0.15.1b_1
diff --git a/srcpkgs/moarvm/template b/srcpkgs/moarvm/template
index 7b265f43f2..c31778c8ba 100644
--- a/srcpkgs/moarvm/template
+++ b/srcpkgs/moarvm/template
@@ -1,11 +1,8 @@
 # Template build file for 'moarvm'.
-
-broken="http://build.voidlinux.eu/builders/x86_64_builder/builds/9888/steps/shell_3/logs/stdio"
-
 pkgname=moarvm
 version=2015.02
-wrksrc="MoarVM-${version}"
-revision=1
+wrksrc="rakudo-star-${version}/MoarVM"
+revision=2
 build_style=configure
 configure_script="perl Configure.pl"
 configure_args="--prefix=/usr/lib/perl6"
@@ -16,5 +13,5 @@ short_desc="MoarVM is a virtual machine for Rakudo Perl 6"
 maintainer="Ruslan <axetwe@gmail.com>"
 homepage="http://moarvm.com"
 license="Artistic-2.0"
-distfiles="http://moarvm.com/releases/MoarVM-${version}.tar.gz"
-checksum="4093ff80e6b40f215dd238282a464de59bbd5c2ef42cb9099e9ef68f07fe8d1b"
+distfiles="http://rakudo.org/downloads/star/rakudo-star-${version}.tar.gz"
+checksum="e54309b0d79afc1491767110ec39a1aa7d9314d93e29dbaab082014cfb055611"
diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template
index 1584b1d84f..4504222aac 100644
--- a/srcpkgs/nqp/template
+++ b/srcpkgs/nqp/template
@@ -2,11 +2,11 @@
 pkgname=nqp
 version=2015.02
 wrksrc="rakudo-star-${version}/nqp"
-revision=1
+revision=2
 build_style=configure
 configure_script="perl Configure.pl"
 configure_args="--prefix=/usr/lib/perl6 --backends=moar"
-hostmakedepends="perl>=5.20 moarvm>=${version}"
+hostmakedepends="perl>=5.20 moarvm>=${version}_${revision}"
 makedepends="${hostmakedepends}"
 short_desc="Not Quite Perl, a lightweight Perl 6-like environment for VMs"
 maintainer="Ruslan <axetwe@gmail.com>"
diff --git a/srcpkgs/rakudo-star/template b/srcpkgs/rakudo-star/template
index a032cbf6e4..2163486514 100644
--- a/srcpkgs/rakudo-star/template
+++ b/srcpkgs/rakudo-star/template
@@ -1,17 +1,14 @@
 # Template build file for 'rakudo-star'.
-
-broken="http://build.voidlinux.eu/builders/x86_64_builder/builds/9889/steps/shell_3/logs/stdio"
-
 pkgname=rakudo-star
 version=2015.02
 wrksrc="rakudo-star-${version}"
-revision=1
+revision=2
 build_style=configure
 configure_script="perl Configure.pl"
 configure_args="--prefix=/usr/lib/perl6 --backends=moar"
-hostmakedepends="perl>=5.20 moarvm>=${version} nqp>=${version}"
+hostmakedepends="perl>=5.20 moarvm>=${version}_${revision} nqp>=${version}_${revision}"
 makedepends="${hostmakedepends}"
-depends="moarvm>=${version} nqp>=${version}"
+depends="moarvm>=${version}_${revision} nqp>=${version}_${revision}"
 short_desc="Rakudo is an implementation of Perl 6 language"
 maintainer="Ruslan <axetwe@gmail.com>"
 homepage="http://rakudo.org"