diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS
index 50755e1a69..cc054c2938 100644
--- a/.github/MAINTAINERS
+++ b/.github/MAINTAINERS
@@ -247,6 +247,7 @@ runtime/ftplugin/pod.vim		@petdance @dkearns
 runtime/ftplugin/poefilter.vim		@ObserverOfTime
 runtime/ftplugin/postscr.vim		@mrdubya
 runtime/ftplugin/prisma.vim		@ribru17
+runtime/ftplugin/proto.vim		@Limero
 runtime/ftplugin/ps1.vim		@heaths
 runtime/ftplugin/ps1xml.vim		@heaths
 runtime/ftplugin/ptx.vim		@jiangyinzuo
diff --git a/runtime/ftplugin/proto.vim b/runtime/ftplugin/proto.vim
new file mode 100644
index 0000000000..585f4461d3
--- /dev/null
+++ b/runtime/ftplugin/proto.vim
@@ -0,0 +1,18 @@
+" Vim filetype plugin
+" Language:	Protobuf
+" Maintainer:	David Pedersen <limero@me.com>
+" Last Change:	2024 Dec 09
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal formatoptions-=t formatoptions+=croql
+
+setlocal comments=s1:/*,mb:*,ex:*/,://
+setlocal commentstring=//\ %s
+
+let b:undo_ftplugin = "setlocal formatoptions< comments< commentstring<"
+
+" vim: sw=2 sts=2 et