diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS
index 322f23cbf1..197e37bc7d 100644
--- a/.github/MAINTAINERS
+++ b/.github/MAINTAINERS
@@ -134,6 +134,8 @@ runtime/ftplugin/asy.vim		@avidseeker
 runtime/ftplugin/autohotkey.vim		@telemachus
 runtime/ftplugin/awk.vim		@dkearns
 runtime/ftplugin/basic.vim		@dkearns
+runtime/ftplugin/brighterscript.vim	@ribru17
+runtime/ftplugin/brightscript.vim	@ribru17
 runtime/ftplugin/bst.vim		@tpope
 runtime/ftplugin/c3.vim		@ttytm
 runtime/ftplugin/cabal.vim		@ribru17
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index f90c6f87bb..6b0e5d611e 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:		The Vim Project <https://github.com/vim/vim>
-" Last Change:		2025 Jun 03
+" Last Change:		2025 Jun 18
 " Former Maintainer:	Bram Moolenaar <Bram@vim.org>
 
 " Listen very carefully, I will say this only once
@@ -309,6 +309,12 @@ au BufNewFile,BufRead *.bb,*.bbappend,*.bbclass,*/build/conf/*.conf,*/meta{-*,}/
 " Blkid cache file
 au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old   setf xml
 
+" Brighterscript
+au BufNewFile,BufRead *.bs			setf brighterscript
+
+" Brightscript
+au BufNewFile,BufRead *.brs			setf brightscript
+
 " BSDL
 au BufNewFile,BufRead *.bsd,*.bsdl			setf bsdl
 
diff --git a/runtime/ftplugin/brighterscript.vim b/runtime/ftplugin/brighterscript.vim
new file mode 100644
index 0000000000..4fe585aec7
--- /dev/null
+++ b/runtime/ftplugin/brighterscript.vim
@@ -0,0 +1,11 @@
+" Vim filetype plugin
+" Language:	Brighterscript
+" Maintainer:	Riley Bruins <ribru17@gmail.com>
+" Last Change:	2025 Jun 17
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+runtime! ftplugin/brightscript.vim
diff --git a/runtime/ftplugin/brightscript.vim b/runtime/ftplugin/brightscript.vim
new file mode 100644
index 0000000000..92bc56d248
--- /dev/null
+++ b/runtime/ftplugin/brightscript.vim
@@ -0,0 +1,13 @@
+" Vim filetype plugin
+" Language:	Brightscript
+" Maintainer:	Riley Bruins <ribru17@gmail.com>
+" Last Change:	2025 Jun 17
+
+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 3ae16e418b..0c74ffba7a 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -142,6 +142,8 @@ def s:GetFilenameChecks(): dict<list<string>>
     blank: ['file.bl'],
     blueprint: ['file.blp'],
     bp: ['Android.bp'],
+    brighterscript: ['file.bs'],
+    brightscript: ['file.brs'],
     bsdl: ['file.bsd', 'file.bsdl'],
     bst: ['file.bst'],
     bzl: ['file.bazel', 'file.bzl', 'WORKSPACE', 'WORKSPACE.bzlmod'],
diff --git a/src/version.c b/src/version.c
index 168ff4e674..04c11f76ce 100644
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1468,
 /**/
     1467,
 /**/