diff --git a/packages/crystal/0.36.1/build.sh b/packages/crystal/0.36.1/build.sh
new file mode 100755
index 0000000..ba10f3f
--- /dev/null
+++ b/packages/crystal/0.36.1/build.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+PREFIX=$(realpath $(dirname $0))
+
+curl -L "https://github.com/crystal-lang/crystal/releases/download/0.36.1/crystal-0.36.1-1-linux-x86_64.tar.gz" -o crystal.tar.gz
+tar xzf crystal.tar.gz --strip-components=1
+rm crystal.tar.gz
diff --git a/packages/crystal/0.36.1/compile b/packages/crystal/0.36.1/compile
new file mode 100644
index 0000000..afbad6c
--- /dev/null
+++ b/packages/crystal/0.36.1/compile
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+# Compile crystal files into out file
+crystal build "$@" -o out --no-color && \
+chmod +x out
diff --git a/packages/crystal/0.36.1/environment b/packages/crystal/0.36.1/environment
new file mode 100644
index 0000000..bd0ff98
--- /dev/null
+++ b/packages/crystal/0.36.1/environment
@@ -0,0 +1 @@
+export PATH=$PWD/bin:$PATH
\ No newline at end of file
diff --git a/packages/crystal/0.36.1/metadata.json b/packages/crystal/0.36.1/metadata.json
new file mode 100644
index 0000000..ca2c062
--- /dev/null
+++ b/packages/crystal/0.36.1/metadata.json
@@ -0,0 +1,6 @@
+{
+    "language": "crystal",
+    "version": "0.36.1",
+    "author": "Dan Vargas <danvargas46@gmail.com>",
+    "aliases": ["crystal", "cr"]
+}
\ No newline at end of file
diff --git a/packages/crystal/0.36.1/run b/packages/crystal/0.36.1/run
new file mode 100644
index 0000000..6955ba9
--- /dev/null
+++ b/packages/crystal/0.36.1/run
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+shift # Filename is only used to compile
+./out "$@"
diff --git a/packages/crystal/0.36.1/test.cr b/packages/crystal/0.36.1/test.cr
new file mode 100644
index 0000000..3fca0dd
--- /dev/null
+++ b/packages/crystal/0.36.1/test.cr
@@ -0,0 +1 @@
+puts("OK")
\ No newline at end of file