diff --git a/common/shlibs b/common/shlibs
index 85dca04f967..c93f000301b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -423,7 +423,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.07_1
+libmoar.so MoarVM-2015.09_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
index 305a8896a03..15893d33813 100644
--- a/srcpkgs/MoarVM/template
+++ b/srcpkgs/MoarVM/template
@@ -1,7 +1,7 @@
 # Template build file for 'MoarVM'.
 pkgname=MoarVM
-only_for_archs="i686 i686-musl x86_64 x86_64-musl"
-version=2015.07
+only_for_archs="i686 x86_64"
+version=2015.09
 revision=1
 build_style=configure
 configure_script="perl Configure.pl"
@@ -13,6 +13,6 @@ maintainer="Ruslan <axetwe@gmail.com>"
 homepage="http://moarvm.com"
 license="Artistic-2.0"
 distfiles="http://moarvm.org/releases/MoarVM-${version}.tar.gz"
-checksum="310a4ea6dbaacaf1837606edf6c42170143f60c8e29eb94c7e6fea810b6af10b"
+checksum="e93d1d2e918764971fd9e9fd68de73ad900abb25d224a5049a105aae54dba7d3"
 shlib_provides="libmoar.so"
 make_install_target="install"
diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template
index 02d04dbfd59..912c4696d0d 100644
--- a/srcpkgs/nqp/template
+++ b/srcpkgs/nqp/template
@@ -1,16 +1,17 @@
 # Template build file for 'nqp'.
 pkgname=nqp
-only_for_archs="i686 i686-musl x86_64 x86_64-musl"
-version=2015.07.2
+only_for_archs="i686 x86_64"
+version=2015.09.1
 revision=1
 build_style=configure
 configure_script="perl Configure.pl"
 configure_args="--prefix=/usr/lib/perl6 --backends=moar"
 hostmakedepends="perl MoarVM"
 makedepends="${hostmakedepends}"
+depends="MoarVM>=2015.09"
 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="https://github.com/perl6/nqp/archive/${version}.tar.gz"
-checksum="673ae8b68e9b4f60562bfbea4233add1bf5da38528f3e38e2f9769ddc8e14e07"
+checksum="750f8f3b837372b278785d41c41c8f7543b40b3e2600fd1c6bd258be0590e70d"
diff --git a/srcpkgs/rakudo-star/template b/srcpkgs/rakudo-star/template
index 73ce9d3c64b..8faf43aa4a2 100644
--- a/srcpkgs/rakudo-star/template
+++ b/srcpkgs/rakudo-star/template
@@ -1,7 +1,7 @@
 # Template build file for 'rakudo-star'.
 pkgname=rakudo-star
-only_for_archs="i686 i686-musl x86_64 x86_64-musl"
-version=2015.07
+only_for_archs="i686 x86_64"
+version=2015.09
 revision=1
 build_style=configure
 configure_script="perl Configure.pl"
@@ -13,9 +13,19 @@ 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="84d7812a735eedc39d7c0898d4fd15ecd82563971744b2bc6ff0a1c581c82910"
-depends="MoarVM nqp"
+checksum="99b0332c4a05d444876efff58714104fc3cbf5f875174c1e410bedca03a6880d"
+depends="MoarVM>=${version} nqp>=${version}"
+
+pre_install() {
+	mkdir -p /usr/lib/perl6/share/perl6/runtime
+	ln -s /destdir/rakudo-star-${version}/usr/lib/perl6/share/perl6/runtime/perl6.moarvm /usr/lib/perl6/share/perl6/runtime/perl6.moarvm
+}
 
 post_install() {
 	vinstall ${FILESDIR}/rakudo-star.sh 644 etc/profile.d
 }
+
+do_clean() {
+	rm    /usr/lib/perl6/share/perl6/runtime/perl6.moarvm
+	rmdir /usr/lib/perl6/share/perl6/runtime
+}