diff --git a/after/ftplugin/qmd.lua b/after/ftplugin/qmd.lua
new file mode 100644
index 0000000..db473e6
--- /dev/null
+++ b/after/ftplugin/qmd.lua
@@ -0,0 +1,5 @@
+vim.treesitter.language.register('markdown', 'qmd')
+
+vim.wo[0][0].foldexpr = 'v:lua.vim.treesitter.foldexpr()'
+vim.wo[0][0].foldmethod = 'expr'
+
diff --git a/after/ftplugin/quarto.lua b/after/ftplugin/quarto.lua
deleted file mode 100644
index 0a060e7..0000000
--- a/after/ftplugin/quarto.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-vim.opt.foldmethod = "expr"
-vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
diff --git a/lua/plugins/lsp/mason.lua b/lua/plugins/lsp/mason.lua
index a75ca54..2ebc196 100644
--- a/lua/plugins/lsp/mason.lua
+++ b/lua/plugins/lsp/mason.lua
@@ -44,7 +44,7 @@ return {
     })
 
     vim.lsp.config.marksman = {
-        filetypes = { "markdown", "quarto" },
+        filetypes = { "markdown", "quarto", "qmd" },
         root_dir = vim.fs.root(0, {
           ".git",
           ".marksman.toml",
diff --git a/lua/plugins/nvim-cmp.lua b/lua/plugins/nvim-cmp.lua
index 57dcb90..c0583c0 100644
--- a/lua/plugins/nvim-cmp.lua
+++ b/lua/plugins/nvim-cmp.lua
@@ -49,6 +49,7 @@ return {
       },
       luasnip.filetype_extend("pandoc", {"markdown"}),
       luasnip.filetype_extend("quarto", {"markdown"}),
+      luasnip.filetype_extend("qmd", {"markdown"}),
     }
 
     -- Load snippets from ~/.config/nvim/my_snippets/
diff --git a/lua/plugins/quarto.lua b/lua/plugins/quarto.lua
index 39cbdc6..7d8b211 100644
--- a/lua/plugins/quarto.lua
+++ b/lua/plugins/quarto.lua
@@ -7,6 +7,7 @@ return {
     lazy = true,
     ft = {
       "quarto",
+      "qmd",
     },
     dependencies = {
       "jmbuhr/otter.nvim",