diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 2b473300fc..b802efa2b9 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -369,6 +369,9 @@ au BufNewFile,BufRead *.ch			call dist#ft#FTchange()
 " ChordPro
 au BufNewFile,BufRead *.chopro,*.crd,*.cho,*.crdpro,*.chordpro	setf chordpro
 
+" Clang-format
+au BufNewFile,BufRead .clang-format		setf yaml
+
 " Clang-tidy
 au BufNewFile,BufRead .clang-tidy		setf yaml
 
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 32c14ae66c..c6bacfbf71 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -641,7 +641,7 @@ let s:filename_checks = {
     \ 'xsd': ['file.xsd'],
     \ 'xslt': ['file.xsl', 'file.xslt'],
     \ 'yacc': ['file.yy', 'file.yxx', 'file.y++'],
-    \ 'yaml': ['file.yaml', 'file.yml', '.clang-tidy'],
+    \ 'yaml': ['file.yaml', 'file.yml', '.clang-format', '.clang-tidy'],
     \ 'yang': ['file.yang'],
     \ 'z8a': ['file.z8a'],
     \ 'zig': ['file.zig'],
diff --git a/src/version.c b/src/version.c
index bf4994622b..e612e53661 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    798,
 /**/
     797,
 /**/