diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 8488f2ec..dce3f27d 100755
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -4000,6 +4000,8 @@ YAML:
   - .syntax
   - .yaml
   - .yaml-tmlanguage
+  filenames:
+  - .clang-format
   ace_mode: yaml
 
 YANG:
diff --git a/samples/YAML/filenames/.clang-format b/samples/YAML/filenames/.clang-format
new file mode 100644
index 00000000..473be300
--- /dev/null
+++ b/samples/YAML/filenames/.clang-format
@@ -0,0 +1,18 @@
+---
+# We'll use defaults from the LLVM style, but with 4 columns indentation.
+BasedOnStyle: LLVM
+IndentWidth: 4
+---
+Language: Cpp
+# Force pointers to the type for C++.
+DerivePointerAlignment: false
+PointerAlignment: Left
+---
+Language: JavaScript
+# Use 100 columns for JS.
+ColumnLimit: 100
+---
+Language: Proto
+# Don't format .proto files.
+DisableFormat: true
+...