diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 9bf84e29f9..f3049636f4 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1093,6 +1093,9 @@ au BufNewFile,BufRead *.jsonnet,*.libsonnet	setf jsonnet
 " Julia
 au BufNewFile,BufRead *.jl			setf julia
 
+" Just
+autocmd BufNewFile,BufRead *[jJ]ustfile,.justfile,*.just setfiletype just
+
 " KDL
 au BufNewFile,BufRead *.kdl			setf kdl
 
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index d9fd919d02..25710116b0 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -350,6 +350,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     jsonnet: ['file.jsonnet', 'file.libsonnet'],
     jsp: ['file.jsp'],
     julia: ['file.jl'],
+    just: ['justfile', 'Justfile', '.justfile', 'config.just'],
     kconfig: ['Kconfig', 'Kconfig.debug', 'Kconfig.file'],
     kdl: ['file.kdl'],
     kivy: ['file.kv'],
diff --git a/src/version.c b/src/version.c
index 4d037b4721..2c99b23849 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 */
+/**/
+    1978,
 /**/
     1977,
 /**/