diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS
index d83f1e2..f09b2c9 100644
--- a/.github/MAINTAINERS
+++ b/.github/MAINTAINERS
@@ -230,6 +230,7 @@
 runtime/ftplugin/tt2html.vim		@petdance
 runtime/ftplugin/typescript.vim		@dkearns
 runtime/ftplugin/typescriptreact.vim	@dkearns
+runtime/ftplugin/typst.vim		@ribru17
 runtime/ftplugin/unison.vim		@chuwy
 runtime/ftplugin/v.vim			@ribru17
 runtime/ftplugin/vdf.vim		@ObserverOfTime
diff --git a/runtime/ftplugin/typst.vim b/runtime/ftplugin/typst.vim
new file mode 100644
index 0000000..c2d7811
--- /dev/null
+++ b/runtime/ftplugin/typst.vim
@@ -0,0 +1,14 @@
+" Vim filetype plugin
+" Language:	typst
+" Maintainer:	Riley Bruins <ribru17@gmail.com>
+" Last Change:	2024 May 19
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
+setlocal commentstring=//\ %s
+
+let b:undo_ftplugin = 'setl com< cms<'