diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23e4a29d..7de41716 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@
 - Add syntax highlighting support for COBOL, see #3584 (@adukhan99)
 - Fixed manpage syntax so that ANSI escape codes don't get incorrectly highlighted and thus broken, see #3586 (@BlueElectivire)
 - Map several Google Cloud CLI config files to their appropriate syntax #3635 (@victor-gp)
+- Map all ignore dotfiles to Git Ignore syntax #3636 (@victor-gp)
 
 ## Themes
 
diff --git a/src/syntax_mapping/builtins/common/90-ignore-files.toml b/src/syntax_mapping/builtins/common/90-ignore-files.toml
new file mode 100644
index 00000000..90984aff
--- /dev/null
+++ b/src/syntax_mapping/builtins/common/90-ignore-files.toml
@@ -0,0 +1,2 @@
+[mappings]
+"Git Ignore" = [".?*ignore"]