diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19357659..03ef66f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@
 
 ## Syntaxes
 
+- Mapped clang-format config file (.clang-format) to YAML syntax (@TruncatedDinosour)
+
 ## Themes
 
 ## `bat` as a library
diff --git a/src/syntax_mapping.rs b/src/syntax_mapping.rs
index ee4fdc40..dd6dc1fc 100644
--- a/src/syntax_mapping.rs
+++ b/src/syntax_mapping.rs
@@ -41,6 +41,9 @@ impl<'a> SyntaxMapping<'a> {
     pub fn builtin() -> SyntaxMapping<'a> {
         let mut mapping = Self::empty();
         mapping.insert("*.h", MappingTarget::MapTo("C++")).unwrap();
+        mapping
+            .insert(".clang-format", MappingTarget::MapTo("YAML"))
+            .unwrap();
         mapping.insert("*.fs", MappingTarget::MapTo("F#")).unwrap();
         mapping
             .insert("build", MappingTarget::MapToUnknown)