diff --git a/README.md b/README.md
index 0c6e117..eeee093 100644
--- a/README.md
+++ b/README.md
@@ -23,11 +23,12 @@ then to run:
 
 ### Tools
 
-Extensions(96) | Tools(57)
+Extensions(98) | Tools(58)
 ----------:| -----
 .* | [contents](http://pygments.org/) • metadata • [git_blame](https://git-scm.com/docs/git-blame) • [git_log](https://git-scm.com/docs/git-log)
 .py | [python_syntax](https://en.wikipedia.org/wiki/Python_syntax_and_semantics) • [python_unittests](https://docs.python.org/3/library/unittest.html) • [pydoc](https://docs.python.org/3/library/pydoc.html) • [mypy](http://mypy-lang.org/) • [python_coverage](https://coverage.readthedocs.io/) • [pycodestyle](http://pycodestyle.pycqa.org/en/latest/) • [pydocstyle](http://www.pydocstyle.org/en/2.1.1/usage.html) • [pyflakes](https://pypi.org/project/pyflakes/) • [pylint](https://www.pylint.org/) • [python_gut](https://github.com/ahamilton/eris/blob/master/gut.py) • [python_modulefinder](https://docs.python.org/3/library/modulefinder.html) • [dis](https://docs.python.org/3/library/dis.html) • [python_mccabe](https://pypi.org/project/mccabe/) • [bandit](https://pypi.org/project/bandit/)
 .pl .pm .t | [perl_syntax](https://en.wikipedia.org/wiki/Perl) • [perldoc](http://perldoc.perl.org/)
+.p6 .pm6 | [perl6_syntax](https://rakudo.org/)
 .pod .pod6 | [perldoc](http://perldoc.perl.org/)
 .c .h | [c_syntax_gcc](https://gcc.gnu.org/) • [cppcheck](http://sourceforge.net/p/cppcheck/wiki/Home/)
 .cc .cpp .hpp | [cpp_syntax_gcc](https://gcc.gnu.org/) • [cppcheck](http://sourceforge.net/p/cppcheck/wiki/Home/)
diff --git a/com.github.ahamilton.eris.json b/com.github.ahamilton.eris.json
index 0207092..6466d36 100644
--- a/com.github.ahamilton.eris.json
+++ b/com.github.ahamilton.eris.json
@@ -2262,6 +2262,28 @@
         }
       ]
     },
+    {
+      "name": "rakudo",
+      "sources": [
+        {
+          "type": "archive",
+          "url": "https://rakudostar.com/files/star/rakudo-star-2019.03.tar.gz",
+          "sha256": "640a69de3a2b4f6c49e75a01040e8770de3650ea1d5bb61057e3dfa3c79cc008"
+        }
+      ],
+      "buildsystem": "simple",
+      "build-commands": [
+        "cd MoarVM; perl Configure.pl --prefix=/app",
+        "cd MoarVM; make -j4",
+        "cd MoarVM; make install",
+        "cd nqp; perl Configure.pl --prefix=/app",
+        "cd nqp; make -j4",
+        "cd nqp; make install",
+        "perl Configure.pl --prefix=/app",
+        "make -j4",
+        "make install"
+      ]
+    },
     {
       "name": "db5.3",
       "sources": [
@@ -2400,10 +2422,10 @@
         {
           "type": "git",
           "url": "https://github.com/ahamilton/eris",
-          "commit": "a2bea77cd29e5d20bbc774beabbb7ee33feeeae4"
+          "commit": "23f553386031b1c7d60e679d649efa8a877a41e4"
         }
       ]
     }
   ],
   "command": "eris"
-}
\ No newline at end of file
+}
diff --git a/eris/tools.py b/eris/tools.py
index 88e7baa..30a3194 100644
--- a/eris/tools.py
+++ b/eris/tools.py
@@ -399,11 +399,6 @@ def perltidy(path):
     return Status.normal, _syntax_highlight_using_path(stdout, path)
 
 
-# def perl6_syntax(path):
-#     return _run_command(["perl6", "-c", path])
-# perl6_syntax.deps={"rakudo"}
-
-
 @deps(deps={"git"}, url="https://git-scm.com/docs/git-log",
       executables={"git"})
 def git_log(path):
diff --git a/eris/tools.toml b/eris/tools.toml
index c4cc6d5..fd14db5 100644
--- a/eris/tools.toml
+++ b/eris/tools.toml
@@ -9,7 +9,7 @@ tools_for_extensions = [
 	     "python_mccabe", "bandit"]],
 #    [["pyc"], ["pydisasm"]],
    [["pl", "pm", "t"], ["perl_syntax", "perldoc"]],
-#    [["p6", "pm6"], ["perl6_syntax", "perldoc"]],
+   [["p6", "pm6"], ["perl6_syntax"]],
    [["pod", "pod6"], ["perldoc"]],
    [["c", "h"], ["c_syntax_gcc", "cppcheck"]],
    [["cc", "cpp", "hpp"], ["cpp_syntax_gcc", "cppcheck"]],
@@ -77,6 +77,11 @@ tools_for_extensions = [
   url = "https://en.wikipedia.org/wiki/Perl"
   command = "perl -c"
 
+[perl6_syntax]
+  dependencies = ["rakudo"]
+  url = "https://rakudo.org/"
+  command = "perl6 -c"
+
 [dis]
   dependencies = []
   url = "https://docs.python.org/3/library/dis.html"
diff --git a/make-flatpak-manifest.py b/make-flatpak-manifest.py
index f3f9248..c446ed5 100755
--- a/make-flatpak-manifest.py
+++ b/make-flatpak-manifest.py
@@ -268,6 +268,23 @@ patches = {
                  "sha256": "059b3cb69970d8c8c5964caced0335b4a"
                            "f34ac990c8e61f7e3f90cd1c2d11e49"}]},
 
+    "rakudo": {"buildsystem": "simple",
+               "build-commands": [
+                   "cd MoarVM; perl Configure.pl --prefix=/app",
+                   "cd MoarVM; make -j4",
+                   "cd MoarVM; make install",
+                   "cd nqp; perl Configure.pl --prefix=/app",
+                   "cd nqp; make -j4",
+                   "cd nqp; make install",
+                   "perl Configure.pl --prefix=/app",
+                   "make -j4",
+                   "make install",
+               ],
+               "sources": [{
+                   "type": "archive",
+                   "url": "https://rakudostar.com/files/star/rakudo-star-2019.03.tar.gz",
+                   "sha256": "640a69de3a2b4f6c49e75a01040e8770de3650ea1d5bb61057e3dfa3c79cc008"}]},
+
     "p7zip": {"buildsystem": "simple",
               "build-commands": [
                   "make -f makefile",