diff --git a/common/shlibs b/common/shlibs
index 316f142e5d..569fd5e48f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -419,7 +419,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.03_1
+libmoar.so MoarVM-2015.06_1
 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
similarity index 59%
rename from srcpkgs/moarvm/template
rename to srcpkgs/MoarVM/template
index bea90378ab..c188d4e276 100644
--- a/srcpkgs/moarvm/template
+++ b/srcpkgs/MoarVM/template
@@ -1,18 +1,18 @@
-# Template build file for 'moarvm'.
-pkgname=moarvm
-version=2015.03
-wrksrc="rakudo-star-${version}/MoarVM"
+# Template build file for 'MoarVM'.
+pkgname=MoarVM
+only_for_archs="i686 i686-musl x86_64 x86_64-musl"
+version=2015.06
 revision=1
-shlib_provides="libmoar.so"
 build_style=configure
 configure_script="perl Configure.pl"
 configure_args="--prefix=/usr/lib/perl6"
-make_install_target="install"
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
 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://rakudo.org/downloads/star/rakudo-star-${version}.tar.gz"
-checksum="bb969c99b39cf69d0f04ae5e9d574de1da8835a1be17710f9e63afc0bcac9bbb"
+distfiles="http://moarvm.org/releases/MoarVM-${version}.tar.gz"
+checksum="8dfe52630a3fcc749b653591f8a4e7fa723cd204cf0f6133b62b70d1b9c5980f"
+shlib_provides="libmoar.so"
+make_install_target="install"
diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template
index b4b910927e..e34089dfdf 100644
--- a/srcpkgs/nqp/template
+++ b/srcpkgs/nqp/template
@@ -1,16 +1,16 @@
 # Template build file for 'nqp'.
 pkgname=nqp
-version=2015.03
-wrksrc="rakudo-star-${version}/nqp"
+only_for_archs="i686 i686-musl x86_64 x86_64-musl"
+version=2015.06
 revision=1
 build_style=configure
 configure_script="perl Configure.pl"
 configure_args="--prefix=/usr/lib/perl6 --backends=moar"
-hostmakedepends="perl moarvm"
+hostmakedepends="perl MoarVM"
 makedepends="${hostmakedepends}"
 short_desc="Not Quite Perl, a lightweight Perl 6-like environment for VMs"
 maintainer="Ruslan <axetwe@gmail.com>"
 homepage="http://github.com/perl6/nqp"
 license="Artistic-2.0"
-distfiles="http://rakudo.org/downloads/star/rakudo-star-${version}.tar.gz"
-checksum="bb969c99b39cf69d0f04ae5e9d574de1da8835a1be17710f9e63afc0bcac9bbb"
+distfiles="https://github.com/perl6/nqp/archive/${version}.tar.gz"
+checksum="80d528501a6843a9746b3060d230b080d3511720e9f4096087466e25703f4a82"
diff --git a/srcpkgs/rakudo-star/template b/srcpkgs/rakudo-star/template
index d5582b9b03..5a6b712011 100644
--- a/srcpkgs/rakudo-star/template
+++ b/srcpkgs/rakudo-star/template
@@ -1,20 +1,20 @@
 # Template build file for 'rakudo-star'.
 pkgname=rakudo-star
-version=2015.03
-wrksrc="rakudo-star-${version}"
+only_for_archs="i686 i686-musl x86_64 x86_64-musl"
+version=2015.06
 revision=1
 build_style=configure
 configure_script="perl Configure.pl"
 configure_args="--prefix=/usr/lib/perl6 --backends=moar"
-hostmakedepends="perl moarvm nqp"
+hostmakedepends="perl MoarVM nqp"
 makedepends="${hostmakedepends}"
-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"
 license="Artistic-2.0"
 distfiles="http://rakudo.org/downloads/star/rakudo-star-${version}.tar.gz"
-checksum="bb969c99b39cf69d0f04ae5e9d574de1da8835a1be17710f9e63afc0bcac9bbb"
+checksum="126491a2c9f408239fb8ed94d5369c9839e3fbe284fdfbfc4e45160ce2db5bc7"
+depends="MoarVM nqp"
 
 post_install() {
 	vinstall ${FILESDIR}/rakudo-star.sh 644 etc/profile.d