diff --git a/CHANGELOG.md b/CHANGELOG.md
index 170bfb58..985471ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@
 - Don't color strings inside CSV files, to make it easier to tell which column they belong to, see #3521 (@keith-hall)
 - 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)
 
 ## Themes
 
diff --git a/src/syntax_mapping/builtins/common/50-gcloud-cli-config.toml b/src/syntax_mapping/builtins/common/50-gcloud-cli-config.toml
new file mode 100644
index 00000000..ea3eec67
--- /dev/null
+++ b/src/syntax_mapping/builtins/common/50-gcloud-cli-config.toml
@@ -0,0 +1,3 @@
+[mappings]
+"INI" = [".boto", "**/gcloud/configurations/config_*"]
+"Git Ignore" = [".gcloudignore"]