diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 60f4f2a9d5..dd4fe7a138 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1299,6 +1299,8 @@ local extension = {
   tfvars = 'terraform-vars',
   thrift = 'thrift',
   tig = 'tiger',
+  Tiltfile = 'tiltfile',
+  tiltfile = 'tiltfile',
   tla = 'tla',
   tli = 'tli',
   toml = 'toml',
@@ -1935,6 +1937,8 @@ local filename = {
   ['tidy.conf'] = 'tidy',
   tidyrc = 'tidy',
   ['.tidyrc'] = 'tidy',
+  Tiltfile = 'tiltfile',
+  tiltfile = 'tiltfile',
   ['.tmux.conf'] = 'tmux',
   ['Cargo.lock'] = 'toml',
   ['/.cargo/config'] = 'toml',
@@ -2757,6 +2761,7 @@ local pattern = {
     ['termcap'] = starsetf(function(_path, _bufnr)
       return require('vim.filetype.detect').printcap('term')
     end),
+    ['^Tiltfile%.'] = starsetf('tiltfile'),
     ['%.t%.html$'] = 'tilde',
     ['%.vhdl_[0-9]'] = starsetf('vhdl'),
     ['vimrc'] = starsetf('vim'),
diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
index 0b043f0ca7..a8eda9b424 100644
--- a/test/old/testdir/test_filetype.vim
+++ b/test/old/testdir/test_filetype.vim
@@ -885,6 +885,7 @@ func s:GetFilenameChecks() abort
     \ 'tidy': ['.tidyrc', 'tidyrc', 'tidy.conf'],
     \ 'tiger': ['file.tig'],
     \ 'tilde': ['file.t.html'],
+    \ 'tiltfile': ['Tiltfile', 'tiltfile', 'file.Tiltfile', 'file.tiltfile', 'Tiltfile.debian'],
     \ 'tla': ['file.tla'],
     \ 'tli': ['file.tli'],
     \ 'tmux': ['tmuxfile.conf', '.tmuxfile.conf', '.tmux-file.conf', '.tmux.conf', 'tmux-file.conf', 'tmux.conf', 'tmux.conf.local'],