diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index d962e0f548..fe3d4b554c 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1200,7 +1200,7 @@ au BufNewFile,BufRead *.jpl,*.jpr		setf jam
 au BufNewFile,BufRead *.janet			setf janet
 
 " Java
-au BufNewFile,BufRead *.java,*.jav		setf java
+au BufNewFile,BufRead *.java,*.jav,*.jsh	setf java
 
 " JavaCC
 au BufNewFile,BufRead *.jj,*.jjt		setf javacc
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index c650867d6f..4761e7137e 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -375,7 +375,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     jal: ['file.jal', 'file.JAL'],
     jam: ['file.jpl', 'file.jpr', 'JAM-file.file', 'JAM.file', 'Prl-file.file', 'Prl.file'],
     janet: ['file.janet'],
-    java: ['file.java', 'file.jav'],
+    java: ['file.java', 'file.jav', 'file.jsh'],
     javacc: ['file.jj', 'file.jjt'],
     javascript: ['file.js', 'file.jsm', 'file.javascript', 'file.es', 'file.mjs', 'file.cjs', '.node_repl_history', '.bun_repl_history', 'deno_history.txt'],
     'javascript.glimmer': ['file.gjs'],
diff --git a/src/version.c b/src/version.c
index 82eb6ea8e3..f34048e91c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    951,
 /**/
     950,
 /**/