diff --git a/runtime/ftplugin/cmake.vim b/runtime/ftplugin/cmake.vim
index 94c0076..9fcf87a 100644
--- a/runtime/ftplugin/cmake.vim
+++ b/runtime/ftplugin/cmake.vim
@@ -2,6 +2,7 @@
 " Language:    CMake
 " Maintainer:  Keith Smiley <keithbsmiley@gmail.com>
 " Last Change: 2018 Aug 30
+" 2024 Apr 20  - add include and suffixadd (Vim Project)
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -15,7 +16,7 @@
 " Don't load another plugin for this buffer
 let b:did_ftplugin = 1
 
-let b:undo_ftplugin = "setl commentstring<"
+let b:undo_ftplugin = "setl inc< sua< commentstring<"
 
 if exists('loaded_matchit')
   let b:match_words = '\<if\>:\<elseif\>\|\<else\>:\<endif\>'
@@ -27,6 +28,8 @@
   let b:undo_ftplugin .= "| unlet b:match_words"
 endif
 
+setlocal include=\s*include
+setlocal suffixesadd=.cmake,-config.cmake
 setlocal commentstring=#\ %s
 
 " restore 'cpo' and clean up buffer variable