diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec6048f2f..df5d08e7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 Added TypeScript parser and TSX parser.
 
+The following extensions are now associated with Clojure: `.bb`,
+`.boot`, `.clj`, `.cljc`, `.clje`, `.cljs`, `.cljx`, `.edn`, `.joke`
+and `.joker`.
+
 Fixed an issue with parsing integer values in CSS with units,
 e.g. `123px`.
 
diff --git a/src/tree_sitter_parser.rs b/src/tree_sitter_parser.rs
index 14475f6a7..63f8c2626 100644
--- a/src/tree_sitter_parser.rs
+++ b/src/tree_sitter_parser.rs
@@ -42,12 +42,14 @@ pub fn from_extension(extension: &OsStr) -> Option<TreeSitterConfig> {
     // TODO: find a nice way to extract name and extension information
     // from the package.json in these parsers.
     match extension.to_string_lossy().borrow() {
-        "clj" => Some(TreeSitterConfig {
-            name: "Clojure",
-            language: unsafe { tree_sitter_clojure() },
-            atom_nodes: (vec![]).into_iter().collect(),
-            open_delimiter_tokens: (vec!["{", "(", "["]).into_iter().collect(),
-        }),
+        "bb" | "boot" | "clj" | "cljc" | "clje" | "cljs" | "cljx" | "edn" | "joke" | "joker" => {
+            Some(TreeSitterConfig {
+                name: "Clojure",
+                language: unsafe { tree_sitter_clojure() },
+                atom_nodes: (vec![]).into_iter().collect(),
+                open_delimiter_tokens: (vec!["{", "(", "["]).into_iter().collect(),
+            })
+        }
         "css" => Some(TreeSitterConfig {
             name: "CSS",
             language: unsafe { tree_sitter_css() },