diff --git a/CHANGELOG.md b/CHANGELOG.md
index 985471ef..bdba0bb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,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/CONTRIBUTING.md b/CONTRIBUTING.md
index 3852a755..3dcd11bf 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -68,6 +68,8 @@ users, please read the corresponding
 [documentation](https://github.com/sharkdp/bat/blob/master/doc/assets.md)
 first.
 
+To map a file name pattern to an existing syntax, read [the documentation here](https://github.com/sharkdp/bat/blob/master/src/syntax_mapping/builtins/README.md).
+
 Note: We are currently not accepting new default themes.
 
 
diff --git a/README.md b/README.md
index 95f4e2a4..f0d4efb4 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ languages:
 ### Git integration
 
 `bat` communicates with `git` to show modifications with respect to the index
-(see left side bar):
+(see left sidebar):
 
 ![Git integration example](https://i.imgur.com/2lSW4RE.png)
 
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"]