diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 4eae2dff..790f527b 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -585,6 +585,8 @@ INI:
   - .prefs
   - .properties
   primary_extension: .ini
+  filenames:
+  - .editorconfig
 
 IRC log:
   lexer: IRC logs
diff --git a/samples/INI/filenames/.editorconfig b/samples/INI/filenames/.editorconfig
new file mode 100644
index 00000000..b73ae712
--- /dev/null
+++ b/samples/INI/filenames/.editorconfig
@@ -0,0 +1,10 @@
+; editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true