diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index e79bbba35e..f445d7cb05 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -978,6 +978,9 @@ au BufNewFile,BufRead .babelrc,.eslintrc,.prettierrc,.firebaserc  setf json
 " JSONC
 au BufNewFile,BufRead *.jsonc			setf jsonc
 
+" Jsonnet
+au BufNewFile,BufRead *.jsonnet,*.libjsonnet	setf jsonnet
+
 " Julia
 au BufNewFile,BufRead *.jl			setf julia
 
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 9d2677c7fc..33b0894b2a 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -285,6 +285,7 @@ let s:filename_checks = {
     \ 'json': ['file.json', 'file.jsonp', 'file.json-patch', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', '.babelrc', '.eslintrc', '.prettierrc', '.firebaserc', 'file.slnf'],
     \ 'json5': ['file.json5'],
     \ 'jsonc': ['file.jsonc'],
+    \ 'jsonnet': ['file.jsonnet', 'file.libjsonnet'],
     \ 'jsp': ['file.jsp'],
     \ 'julia': ['file.jl'],
     \ 'kconfig': ['Kconfig', 'Kconfig.debug', 'Kconfig.file'],
diff --git a/src/version.c b/src/version.c
index 86924eddf0..7a79fdc4bd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -703,6 +703,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    417,
 /**/
     416,
 /**/