diff --git a/dev-lang/rakudo/files/rakudo-2016.03-Makefile.in.patch b/dev-lang/rakudo/files/rakudo-2016.03-Makefile.in.patch
new file mode 100644
index 0000000..adafa0d
--- /dev/null
+++ b/dev-lang/rakudo/files/rakudo-2016.03-Makefile.in.patch
@@ -0,0 +1,17 @@
+diff -Naur a/tools/build/Makefile-Moar.in b/tools/build/Makefile-Moar.in
+--- a/tools/build/Makefile-Moar.in     2016-02-02 14:27:13.000000000 +0100
++++ b/tools/build/Makefile-Moar.in     2016-04-22 15:01:35.338534944 +0200
+@@ -87,11 +87,11 @@
+       $(M_CC) @moar::ccswitch@ @moar::ccshared@ $(M_CFLAGS) -I$(PREFIX)/include/libatomic_ops \
+           -I$(PREFIX)/include/dyncall -I$(PREFIX)/include/moar \
+           -I$(PREFIX)/include/sha1 -I$(PREFIX)/include/tinymt  -I$(PREFIX)/include/libtommath \
+-          -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::ccout@$(M_PERL6_OPS_OBJ) $(M_PERL6_OPS_SRC)
++                      -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::cincludes@ @moar::ccout@$(M_PERL6_OPS_OBJ) $(M_PERL6_OPS_SRC)
+       $(M_CC) @moar::ccswitch@ @moar::ccshared@ $(M_CFLAGS) -I$(PREFIX)/include/libatomic_ops \
+           -I$(PREFIX)/include/dyncall -I$(PREFIX)/include/moar \
+           -I$(PREFIX)/include/sha1 -I$(PREFIX)/include/tinymt  -I$(PREFIX)/include/libtommath \
+-          -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::ccout@$(M_PERL6_CONT_OBJ) $(M_PERL6_CONT_SRC)
++                      -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::cincludes@ @moar::ccout@$(M_PERL6_CONT_OBJ) $(M_PERL6_CONT_SRC)
+       $(M_LD) @moar::ldswitch@ -L@moar::libdir@ @moar::ldshared@ $(M_LDFLAGS) @moar::ldout@$(M_PERL6_OPS_DLL) $(M_PERL6_OPS_OBJ) $(M_PERL6_CONT_OBJ) -lmoar @moarimplib@
+
+ $(PERL6_ML_MOAR): src/Perl6/ModuleLoader.nqp src/vm/moar/ModuleLoaderVMConfig.nqp
diff --git a/dev-lang/rakudo/metadata.xml b/dev-lang/rakudo/metadata.xml
index 5a5e997..73a3889 100644
--- a/dev-lang/rakudo/metadata.xml
+++ b/dev-lang/rakudo/metadata.xml
@@ -5,8 +5,11 @@
                <email>patrick@gentoo.org</email>
                <name>Patrick Lauer</name>
        </maintainer>
-        <maintainer type="project">
+    <maintainer type="project">
         <email>perl@gentoo.org</email>
         <name>Gentoo Perl Project</name>
-        </maintainer>
+    </maintainer>
+    <use>
+               <flag name="moar">Use the MoarVM as backend</flag>
+       </use>
 </pkgmetadata>
diff --git a/dev-lang/rakudo/rakudo-2016.03-r1.ebuild b/dev-lang/rakudo/rakudo-2016.03-r1.ebuild
new file mode 100644
index 0000000..82243fa
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-2016.03-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="A compiler for the Perl 6 programming language"
+HOMEPAGE="http://rakudo.org"
+
+if [[ ${PV} == "9999" ]]; then
+       EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
+       inherit git-r3
+else
+       SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
+fi
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# TODO: add USE="javascript" once that's usable in nqp
+IUSE="java moar test"
+
+RDEPEND="=dev-lang/nqp-${PV}:=[moar]"
+DEPEND="${RDEPEND}
+       >=dev-lang/perl-5.10"
+
+REQUIRED_USE="|| ( java moar )"
+#PATCHES=(${FILESDIR}/${PV})
+PATCHES=( "${FILESDIR}/${P}-Makefile.in.patch" )
+
+src_prepare() {
+       eapply "${PATCHES[@]}"
+       echo "DESTDIR   = ${D}" > "${T}/Makefile-Moar.in" || die
+       cat "${S}/tools/build/Makefile-Moar.in" >> "${T}/Makefile-Moar.in" || die
+       mv "${T}/Makefile-Moar.in" "${S}/tools/build/Makefile-Moar.in" || die
+       eapply_user
+}
+
+src_configure() {
+       local backends
+       use java && backends+="jvm,"