diff --git a/api/main.go b/api/main.go
index 17a4d4c..aa41044 100644
--- a/api/main.go
+++ b/api/main.go
@@ -71,7 +71,7 @@ func Execute(res http.ResponseWriter, req *http.Request) {
         "cpp", "c++",
         "csharp", "cs", "c#",
         "elixir", "exs",
-        "emacs",
+        "elisp", "el",
         "go",
         "java",
         "julia", "jl",
diff --git a/lxc/execute b/lxc/execute
index 3c7880a..8578680 100755
--- a/lxc/execute
+++ b/lxc/execute
@@ -99,6 +99,12 @@ case "$lang" in
 "swift")
     bin=swift
     ;;
+"elisp" | "el")
+    bin=emacs
+    ;;
+"bash")
+    bin=bash
+    ;;
 "typescript" | "ts")
     bin=typescript
     ;;
diff --git a/lxc/executors/emacs b/lxc/executors/emacs
new file mode 100755
index 0000000..dcff507
--- /dev/null
+++ b/lxc/executors/emacs
@@ -0,0 +1,2 @@
+cd /tmp/$2
+runuser -l runner$1 -c "cd /tmp/$2 ; cat args.args | xargs -d '\n' timeout -s KILL 3 emacs -Q --script code.code"
diff --git a/tests/test.el b/tests/test.el
new file mode 100644
index 0000000..2c2a402
--- /dev/null
+++ b/tests/test.el
@@ -0,0 +1 @@
+(message "good")