diff --git a/rc/filetype/git.kak b/rc/filetype/git.kak
index 52304582..bc19b180 100644
--- a/rc/filetype/git.kak
+++ b/rc/filetype/git.kak
@@ -10,11 +10,15 @@ hook global BufCreate .*(\.gitconfig|git/config) %{
     set-option buffer filetype ini
 }
 
+hook global BufCreate .*\.gitignore %{
+    set-option buffer filetype git-ignore
+}
+
 hook global BufCreate .*git-rebase-todo %{
     set-option buffer filetype git-rebase
 }
 
-hook global WinSetOption filetype=git-(commit|notes|rebase) %{
+hook global WinSetOption filetype=git-(commit|ignore|notes|rebase) %{
     require-module "git-%val{hook_param_capture_1}"
 }
 
@@ -23,6 +27,11 @@ hook -group git-commit-highlight global WinSetOption filetype=git-commit %{
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/git-commit }
 }
 
+hook -group git-ignore-highlight global WinSetOption filetype=git-ignore %{
+    add-highlighter window/git-ignore ref git-ignore
+    hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/git-ignore }
+}
+
 hook -group git-notes-highlight global WinSetOption filetype=git-notes %{
     add-highlighter window/git-notes ref git-notes
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/git-notes }
@@ -33,7 +42,6 @@ hook -group git-rebase-highlight global WinSetOption filetype=git-rebase %{
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/git-rebase }
 }
 
-
 provide-module git-commit %{
 require-module diff
 add-highlighter shared/git-commit regions
@@ -43,6 +51,13 @@ add-highlighter shared/git-commit/comments/ fill comment
 add-highlighter shared/git-commit/comments/ regex "\b(?:(modified)|(deleted)|(new file)|(renamed|copied)):([^\n]*)$" 1:yellow 2:red 3:green 4:blue 5:magenta
 }
 
+provide-module git-ignore %{
+add-highlighter shared/git-ignore group
+add-highlighter shared/git-ignore/glob regex '(?<!\\)\*((?<!\\)\*)?|(?<!\\)\?' 0:operator
+add-highlighter shared/git-ignore/negate regex '^!' 0:operator
+add-highlighter shared/git-ignore/comments regex '^#.*?$' 0:comment
+}
+
 provide-module git-notes %{
 add-highlighter shared/git-notes regex ^#[^\n]*$ 0:comment
 }