diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS
index 8777ad93cf..26cc51af09 100644
--- a/.github/MAINTAINERS
+++ b/.github/MAINTAINERS
@@ -243,6 +243,7 @@ runtime/ftplugin/nu.vim					@mrcjkb
 runtime/ftplugin/octave.vim				@dkearns
 runtime/ftplugin/ondir.vim				@jparise
 runtime/ftplugin/opencl.vim				@Freed-Wu
+runtime/ftplugin/openscad.vim                           @squibid
 runtime/ftplugin/openvpn.vim				@ObserverOfTime
 runtime/ftplugin/pascal.vim				@dkearns
 runtime/ftplugin/pbtxt.vim				@lakshayg
diff --git a/runtime/ftplugin/openscad.vim b/runtime/ftplugin/openscad.vim
new file mode 100644
index 0000000000..1f07b21680
--- /dev/null
+++ b/runtime/ftplugin/openscad.vim
@@ -0,0 +1,14 @@
+" Vim filetype plugin file
+" Language:    OpenSCAD (https://openscad.org)
+" Maintainer:  Zachary Scheiman <me@zacharyscheiman.com>
+" Last Change: 2025 Aug 3
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+" Comments in openscad follow C/C++ syntax
+setlocal commentstring=//\ %s
+
+let b:undo_ftplugin = 'setl commentstring<'