diff --git a/api/main.go b/api/main.go
index 4c1d0d1..a9cc087 100644
--- a/api/main.go
+++ b/api/main.go
@@ -139,6 +139,8 @@ func launch(request Inbound, res http.ResponseWriter) {
         execlang = "cpp"
     case "cs", "c#":
         execlang = "csharp"
+    case "elixir", "exs":
+        execlang = "elixir"
     case "asm":
         execlang = "nasm"
     case "js", "javascript":
diff --git a/lxc/versions b/lxc/versions
index f53836e..a0c9977 100755
--- a/lxc/versions
+++ b/lxc/versions
@@ -24,6 +24,9 @@ echo '---'
 echo 'julia'
 lxc-attach --clear-env -n piston -- /bin/bash -l -c "julia --version"
 echo '---'
+echo "elixir"
+lxc-attach --clear-env -n piston -- /bin/bash -l -c "elixir --version"
+echo "---"
 echo 'nasm'
 lxc-attach --clear-env -n piston -- /bin/bash -l -c "nasm -version"
 echo '---'