diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6dffbee..009576e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Next
 - Fix [#1524](https://github.com/Glavin001/atom-beautify/issues/1524). Add PHP-CS-Fixer config file setting and improve automatic detection of standard config files. See [#1661](https://github.com/Glavin001/atom-beautify/pull/1661)
+- Add support for files with '.config' extension. Add extension to the XML language to support XML config files.
 - ...
 
 # v0.29.25 (2017-05-12)
diff --git a/README.md b/README.md
index 8a5dbfe..bc65293 100644
--- a/README.md
+++ b/README.md
@@ -183,7 +183,7 @@ See [all supported options in the documentation at  `docs/options.md`](docs/opti
 | Vala | `Vala` |`.vala`, `.vapi` | [`Uncrustify`](https://github.com/uncrustify/uncrustify) (Default) |
 | Visualforce | `Visualforce` |`.page` | [`Pretty Diff`](https://github.com/prettydiff/prettydiff) (Default) |
 | Vue | `Vue Component` |`.vue` | [`Vue Beautifier`](https://github.com/Glavin001/atom-beautify/blob/master/src/beautifiers/vue-beautifier.coffee) (Default) |
-| XML | `SLD`, `XML`, `XHTML`, `XSD`, `XSL`, `JSP`, `GSP` |`.sld`, `.xml`, `.xhtml`, `.xsd`, `.xsl`, `.jsp`, `.gsp`, `.plist`, `.recipe` | [`JS Beautify`](https://github.com/beautify-web/js-beautify), [`Pretty Diff`](https://github.com/prettydiff/prettydiff) (Default) |
+| XML | `SLD`, `XML`, `XHTML`, `XSD`, `XSL`, `JSP`, `GSP` |`.sld`, `.xml`, `.xhtml`, `.xsd`, `.xsl`, `.jsp`, `.gsp`, `.plist`, `.recipe`, `.config` | [`JS Beautify`](https://github.com/beautify-web/js-beautify), [`Pretty Diff`](https://github.com/prettydiff/prettydiff) (Default) |
 | XTemplate | `XTemplate` |`.xtemplate` | [`Pretty Diff`](https://github.com/prettydiff/prettydiff) (Default) |
 | YAML | `YAML` |`.yml`, `.yaml` | [`align-yaml`](https://github.com/jonschlinkert/align-yaml) (Default) |
 
diff --git a/examples/nested-jsbeautifyrc/xml-config/expected/test.config b/examples/nested-jsbeautifyrc/xml-config/expected/test.config
new file mode 100644
index 0000000..182a677
--- /dev/null
+++ b/examples/nested-jsbeautifyrc/xml-config/expected/test.config
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <system.webServer>
+    <handlers accessPolicy="Read, Script"/>
+    <directoryBrowse enabled="false"/>
+    <defaultDocument>
+      <files>
+        <clear/>
+        <add value="Default.aspx"/>
+        <add value="default.asp"/>
+        <add value="index.html"/>
+        <add value="index.htm"/>
+        <add value="default.html"/>
+        <add value="default.htm"/>
+      </files>
+    </defaultDocument>
+    <httpErrors>
+      <clear/>
+    </httpErrors>
+  </system.webServer>
+</configuration>
\ No newline at end of file
diff --git a/examples/nested-jsbeautifyrc/xml-config/original/test.config b/examples/nested-jsbeautifyrc/xml-config/original/test.config
new file mode 100644
index 0000000..edd6ef6
--- /dev/null
+++ b/examples/nested-jsbeautifyrc/xml-config/original/test.config
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+<system.webServer>
+<handlers accessPolicy="Read, Script" />
+<directoryBrowse enabled="false" />
+<defaultDocument>
+    <files>
+    <clear />
+    <add value="Default.aspx" />
+    <add value="default.asp" />
+    <add value="index.html" />
+    <add value="index.htm" />
+    <add value="default.html" />
+    <add value="default.htm" />
+    </files>
+</defaultDocument>
+<httpErrors>
+  <clear />
+</httpErrors>
+</system.webServer>
+</configuration>
diff --git a/package.json b/package.json
index 6ef3160..7ae4459 100644
--- a/package.json
+++ b/package.json
@@ -138,6 +138,10 @@
     {
       "name": "James Power",
       "url": "https://github.com/thejamespower"
+    },
+    {
+      "name": "Eli Donahue",
+      "url": "https://github.com/elijdonahue"
     }
   ],
   "engines": {
diff --git a/src/languages/xml.coffee b/src/languages/xml.coffee
index 5c1bc45..dffaf17 100644
--- a/src/languages/xml.coffee
+++ b/src/languages/xml.coffee
@@ -16,7 +16,7 @@ module.exports = {
   Supported extensions
   ###
   extensions: [
-    'sld', 'xml', 'xhtml', 'xsd', 'xsl', 'jsp', 'gsp', 'plist', 'recipe'
+    'sld', 'xml', 'xhtml', 'xsd', 'xsl', 'jsp', 'gsp', 'plist', 'recipe', 'config'
   ]
 
   defaultBeautifier: "Pretty Diff"
diff --git a/src/options.json b/src/options.json
index 40d28f3..453103e 100644
--- a/src/options.json
+++ b/src/options.json
@@ -8631,7 +8631,8 @@
       "jsp",
       "gsp",
       "plist",
-      "recipe"
+      "recipe",
+      "config"
     ],
     "properties": {
       "indent_inner_html": {