diff --git a/.gitmodules b/.gitmodules
index 05a2491880..76868c9cda 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -728,9 +728,6 @@
 [submodule "vendor/grammars/language-maxscript"]
 	path = vendor/grammars/language-maxscript
 	url = https://github.com/Alhadis/language-maxscript
-[submodule "vendor/grammars/language-mcfunction"]
-	path = vendor/grammars/language-mcfunction
-	url = https://github.com/Arcensoth/language-mcfunction
 [submodule "vendor/grammars/language-mermaid"]
 	path = vendor/grammars/language-mermaid
 	url = https://github.com/Alhadis/language-mermaid.git
@@ -1196,6 +1193,9 @@
 [submodule "vendor/grammars/syntax"]
 	path = vendor/grammars/syntax
 	url = https://github.com/hashicorp/syntax.git
+[submodule "vendor/grammars/syntax-mcfunction"]
+	path = vendor/grammars/syntax-mcfunction
+	url = https://github.com/MinecraftCommands/syntax-mcfunction.git
 [submodule "vendor/grammars/tcl.tmbundle"]
 	path = vendor/grammars/tcl.tmbundle
 	url = https://github.com/textmate/tcl.tmbundle
diff --git a/grammars.yml b/grammars.yml
index 23c95ad2f7..22312fb1b1 100644
--- a/grammars.yml
+++ b/grammars.yml
@@ -679,9 +679,6 @@ vendor/grammars/language-macaulay2:
 - source.m2
 vendor/grammars/language-maxscript:
 - source.maxscript
-vendor/grammars/language-mcfunction:
-- markdown.mcfunction.codeblock
-- source.mcfunction
 vendor/grammars/language-mermaid:
 - source.mermaid
 - source.mermaid.c4c-diagram
@@ -1070,6 +1067,8 @@ vendor/grammars/syntax:
 - source.hcl
 - source.hcl.terraform
 - source.sentinel
+vendor/grammars/syntax-mcfunction:
+- source.mcfunction
 vendor/grammars/tcl.tmbundle:
 - source.tcl
 - text.html.tcl
diff --git a/vendor/README.md b/vendor/README.md
index bb42a892d3..068fe7c102 100644
--- a/vendor/README.md
+++ b/vendor/README.md
@@ -662,7 +662,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **jq:** [wader/language-jq](https://github.com/wader/language-jq)
 - **kvlang:** [p0lygun/kivy-language-grammer](https://github.com/p0lygun/kivy-language-grammer)
 - **mIRC Script:** [gen-angry/language-msl](https://github.com/gen-angry/language-msl)
-- **mcfunction:** [Arcensoth/language-mcfunction](https://github.com/Arcensoth/language-mcfunction)
+- **mcfunction:** [MinecraftCommands/syntax-mcfunction](https://github.com/MinecraftCommands/syntax-mcfunction)
 - **mupad:** [ccreutzig/sublime-MuPAD](https://github.com/ccreutzig/sublime-MuPAD)
 - **nanorc:** [Alhadis/language-etc](https://github.com/Alhadis/language-etc)
 - **nesC:** [cdwilson/nesC.tmbundle](https://github.com/cdwilson/nesC.tmbundle)
diff --git a/vendor/grammars/language-mcfunction b/vendor/grammars/language-mcfunction
deleted file mode 160000
index d525d3b976..0000000000
--- a/vendor/grammars/language-mcfunction
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d525d3b976869b093893c0cab2645455e12e2464
diff --git a/vendor/grammars/syntax-mcfunction b/vendor/grammars/syntax-mcfunction
new file mode 160000
index 0000000000..458827b540
--- /dev/null
+++ b/vendor/grammars/syntax-mcfunction
@@ -0,0 +1 @@
+Subproject commit 458827b54015dd70dbc356574c964d22f02401a7
diff --git a/vendor/licenses/git_submodule/language-mcfunction.dep.yml b/vendor/licenses/git_submodule/syntax-mcfunction.dep.yml
similarity index 86%
rename from vendor/licenses/git_submodule/language-mcfunction.dep.yml
rename to vendor/licenses/git_submodule/syntax-mcfunction.dep.yml
index 494e367239..5ab47b4db9 100644
--- a/vendor/licenses/git_submodule/language-mcfunction.dep.yml
+++ b/vendor/licenses/git_submodule/syntax-mcfunction.dep.yml
@@ -1,15 +1,15 @@
 ---
-name: language-mcfunction
-version: d525d3b976869b093893c0cab2645455e12e2464
+name: syntax-mcfunction
+version: 458827b54015dd70dbc356574c964d22f02401a7
 type: git_submodule
-homepage: https://github.com/Arcensoth/language-mcfunction
+homepage: https://github.com/MinecraftCommands/syntax-mcfunction.git
 license: mit
 licenses:
 - sources: LICENSE
   text: |
     MIT License
 
-    Copyright (c) 2019-2020 Arcensoth
+    Copyright (c) 2023-2023 MinecraftCommands
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal