diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS
index e2f1faf..b3822c2 100644
--- a/.github/MAINTAINERS
+++ b/.github/MAINTAINERS
@@ -202,6 +202,7 @@
 runtime/ftplugin/kivy.vim		@ribru17
 runtime/ftplugin/kotlin.vim		@udalov
 runtime/ftplugin/ldapconf.vim		@ribru17
+runtime/ftplugin/leo.vim		@ribru17
 runtime/ftplugin/less.vim		@genoma
 runtime/ftplugin/lex.vim		@ribru17
 runtime/ftplugin/liquid.vim		@tpope
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index f2ddcc6..b3cec87 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1325,6 +1325,9 @@
 " lf configuration (lfrc)
 au BufNewFile,BufRead lfrc			setf lf
 
+" Leo
+au BufNewFile,BufRead *.leo			setf leo
+
 " Less
 au BufNewFile,BufRead *.less			setf less
 
diff --git a/runtime/ftplugin/leo.vim b/runtime/ftplugin/leo.vim
new file mode 100644
index 0000000..a009c02
--- /dev/null
+++ b/runtime/ftplugin/leo.vim
@@ -0,0 +1,13 @@
+" Vim filetype plugin
+" Language:	Leo
+" Maintainer:	Riley Bruins <ribru17@gmail.com>
+" Last Change:	2024 Nov 03
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setl comments=:// commentstring=//\ %s
+
+let b:undo_ftplugin = 'setl com< cms<'
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 050ff5f..9ddab96 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -408,6 +408,7 @@
     ldif: ['file.ldif'],
     lean: ['file.lean'],
     ledger: ['file.ldg', 'file.ledger', 'file.journal'],
+    leo: ['file.leo'],
     less: ['file.less'],
     lex: ['file.lex', 'file.l', 'file.lxx', 'file.l++'],
     lf: ['lfrc'],
diff --git a/src/version.c b/src/version.c
index d213e66..f13567f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    839,
+/**/
     838,
 /**/
     837,