diff --git a/languages.toml b/languages.toml
index d214a082fcc3..325a39dfc4c6 100644
--- a/languages.toml
+++ b/languages.toml
@@ -878,14 +878,25 @@ source = { git = "https://github.com/ganezdragon/tree-sitter-perl", rev = "0ac2c
 
 [[language]]
 name = "racket"
-scope = "source.rkt"
+scope = "source.racket"
 roots = []
-file-types = ["rkt"]
+file-types = ["rkt", "rktd", "rktl", "scrbl"]
 shebangs = ["racket"]
 comment-token = ";"
 language-server = { command = "racket", args = ["-l", "racket-langserver"] }
 grammar = "scheme"
 
+[[language]]
+name = "common-lisp"
+scope = "source.lisp"
+roots = []
+file-types = ["lisp", "asd", "cl", "l", "lsp", "ny"," podsl", "sexp"]
+shebangs = ["lisp", "sbcl", "ccl", "clisp", "ecl"]
+comment-token = ";"
+indent = { tab-width = 2, unit = "  " }
+language-server = { command = "cl-lsp", args = [ "stdio" ] }
+grammar = "scheme"
+
 [[language]]
 name = "comment"
 scope = "scope.comment"
diff --git a/runtime/queries/common-lisp/highlights.scm b/runtime/queries/common-lisp/highlights.scm
new file mode 100644
index 000000000000..e11eb7881081
--- /dev/null
+++ b/runtime/queries/common-lisp/highlights.scm
@@ -0,0 +1 @@
+; inherits: scheme
diff --git a/runtime/queries/common-lisp/injections.scm b/runtime/queries/common-lisp/injections.scm
new file mode 100644
index 000000000000..e11eb7881081
--- /dev/null
+++ b/runtime/queries/common-lisp/injections.scm
@@ -0,0 +1 @@
+; inherits: scheme