diff --git a/runtime/ftplugin/sql.vim b/runtime/ftplugin/sql.vim
index c85232f..61b7e67 100644
--- a/runtime/ftplugin/sql.vim
+++ b/runtime/ftplugin/sql.vim
@@ -4,6 +4,7 @@
 " Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
 " Last Change: 2017 Mar 07
 "              2024 Jan 14 by Vim Project (browsefilter)
+"              2024 May 18 by Vim Project (set comment options)
 " Download:    http://vim.sourceforge.net/script.php?script_id=454
 
 " For more details please use:
@@ -105,6 +106,8 @@
 setlocal formatoptions-=t
 setlocal formatoptions+=c
 
+setlocal comments=:-- commentstring=--\ %s
+
 " Functions/Commands to allow the user to change SQL syntax dialects
 " through the use of :SQLSetType <tab> for completion.
 " This works with both Vim 6 and 7.
@@ -266,7 +269,7 @@
     finish
 endif
 
-let b:undo_ftplugin = "setl comments< formatoptions< define< omnifunc<" .
+let b:undo_ftplugin = "setl comments< commentstring< formatoptions< define< omnifunc<" .
             \ " | unlet! b:browsefilter b:match_words"
 
 " Don't load another plugin for this buffer