diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12f84023d..7e8208d32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,64 +3,66 @@
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
 - [Changelog](#changelog)
+  - [v6.6.0](#v660)
+    - [Enhancements](#enhancements)
   - [v6.5.1](#v651)
     - [Bug Fixes](#bug-fixes)
   - [v6.5.0](#v650)
-    - [Enhancements](#enhancements)
+    - [Enhancements](#enhancements-1)
     - [Bug Fixes](#bug-fixes-1)
   - [v6.4.0](#v640)
-    - [Enhancements](#enhancements-1)
+    - [Enhancements](#enhancements-2)
     - [Bug Fixes](#bug-fixes-2)
   - [v6.3.0](#v630)
-    - [Enhancements](#enhancements-2)
+    - [Enhancements](#enhancements-3)
     - [Bug Fixes](#bug-fixes-3)
   - [v6.2.0](#v620)
-    - [Enhancements](#enhancements-3)
+    - [Enhancements](#enhancements-4)
     - [Bug Fixes](#bug-fixes-4)
   - [v6.1.1](#v611)
     - [Bug Fixes](#bug-fixes-5)
   - [v6.1.0](#v610)
-    - [Enhancements](#enhancements-4)
+    - [Enhancements](#enhancements-5)
     - [Bug Fixes](#bug-fixes-6)
   - [v6.0.0](#v600)
-    - [Enhancements](#enhancements-5)
+    - [Enhancements](#enhancements-6)
     - [Bug Fixes](#bug-fixes-7)
     - [Incompatible Changes](#incompatible-changes)
   - [v5.1.0](#v510)
-    - [Enhancements](#enhancements-6)
+    - [Enhancements](#enhancements-7)
     - [Bug Fixes](#bug-fixes-8)
   - [v5.0.0](#v500)
-    - [Enhancements](#enhancements-7)
+    - [Enhancements](#enhancements-8)
     - [Bug Fixes](#bug-fixes-9)
     - [Incompatible Changes](#incompatible-changes-1)
   - [v4.7.0](#v470)
-    - [Enhancements](#enhancements-8)
+    - [Enhancements](#enhancements-9)
     - [Bug Fixes](#bug-fixes-10)
   - [v4.6.0](#v460)
-    - [Enhancements](#enhancements-9)
+    - [Enhancements](#enhancements-10)
     - [Bug Fixes](#bug-fixes-11)
   - [v4.5.0](#v450)
-    - [Enhancements](#enhancements-10)
-  - [v4.4.0](#v440)
     - [Enhancements](#enhancements-11)
+  - [v4.4.0](#v440)
+    - [Enhancements](#enhancements-12)
     - [Bug Fixes](#bug-fixes-12)
   - [v4.3.0](#v430)
-    - [Enhancements](#enhancements-12)
+    - [Enhancements](#enhancements-13)
     - [Bug Fixes](#bug-fixes-13)
   - [v4.2.0](#v420)
-    - [Enhancements](#enhancements-13)
+    - [Enhancements](#enhancements-14)
     - [Bug Fixes](#bug-fixes-14)
   - [v4.1.0](#v410)
-    - [Enhancements](#enhancements-14)
+    - [Enhancements](#enhancements-15)
     - [Bug Fixes](#bug-fixes-15)
   - [v4.0.0](#v400)
-    - [Enhancements](#enhancements-15)
+    - [Enhancements](#enhancements-16)
     - [Bug Fixes](#bug-fixes-16)
     - [Incompatible Changes](#incompatible-changes-2)
   - [v3.0.1](#v301)
     - [Bug Fixes](#bug-fixes-17)
   - [v3.0.0](#v300)
-    - [Enhancements](#enhancements-16)
+    - [Enhancements](#enhancements-17)
     - [Bug Fixes](#bug-fixes-18)
     - [Incompatible Changes](#incompatible-changes-3)
   - [v2.2.0](#v220)
@@ -70,62 +72,75 @@
     - [Enhancement](#enhancement-1)
     - [Bug Fixes](#bug-fixes-20)
   - [v2.0.0](#v200)
-    - [Enhancements](#enhancements-17)
+    - [Enhancements](#enhancements-18)
     - [Bug Fixes](#bug-fixes-21)
     - [Incompatible Changes](#incompatible-changes-4)
   - [v1.2.1](#v121)
-    - [Enhancements](#enhancements-18)
+    - [Enhancements](#enhancements-19)
     - [Bug Fixes](#bug-fixes-22)
   - [v1.2.0](#v120)
-    - [Enhancements](#enhancements-19)
-  - [v1.1.0](#v110)
     - [Enhancements](#enhancements-20)
-  - [v1.0.0](#v100)
+  - [v1.1.0](#v110)
     - [Enhancements](#enhancements-21)
+  - [v1.0.0](#v100)
+    - [Enhancements](#enhancements-22)
     - [Bug Fixes](#bug-fixes-23)
     - [Incompatible Fixes](#incompatible-fixes)
   - [v0.3.5](#v035)
-    - [Enhancements](#enhancements-22)
+    - [Enhancements](#enhancements-23)
     - [Bug Fixes](#bug-fixes-24)
   - [v0.3.4](#v034)
-    - [Enhancements](#enhancements-23)
-  - [v0.3.3](#v033)
     - [Enhancements](#enhancements-24)
+  - [v0.3.3](#v033)
+    - [Enhancements](#enhancements-25)
   - [v0.3.2](#v032)
     - [Bug Fixes](#bug-fixes-25)
   - [v0.3.1](#v031)
-    - [Enhancements](#enhancements-25)
-  - [v0.3.0](#v030)
     - [Enhancements](#enhancements-26)
+  - [v0.3.0](#v030)
+    - [Enhancements](#enhancements-27)
     - [Incompatible Changes](#incompatible-changes-5)
   - [v0.2.1](#v021)
-    - [Enhancements](#enhancements-27)
+    - [Enhancements](#enhancements-28)
     - [Bug Fixes](#bug-fixes-26)
   - [v0.2.0](#v020)
-    - [Enhancements](#enhancements-28)
+    - [Enhancements](#enhancements-29)
     - [Incompatible Changes](#incompatible-changes-6)
   - [v0.1.4](#v014)
-    - [Enhancements](#enhancements-29)
+    - [Enhancements](#enhancements-30)
     - [Bug Fixes](#bug-fixes-27)
   - [v0.1.3](#v013)
     - [Bug Fixes](#bug-fixes-28)
   - [v0.1.2](#v012)
-    - [Enhancements](#enhancements-30)
+    - [Enhancements](#enhancements-31)
   - [v0.1.1](#v011)
     - [Bug Fixes](#bug-fixes-29)
   - [v0.1.0](#v010)
-    - [Enhancements](#enhancements-31)
+    - [Enhancements](#enhancements-32)
     - [Bug Fixes](#bug-fixes-30)
   - [v0.0.3](#v003)
-    - [Enhancements](#enhancements-32)
-  - [v0.0.2](#v002)
     - [Enhancements](#enhancements-33)
+  - [v0.0.2](#v002)
+    - [Enhancements](#enhancements-34)
     - [Bug Fixes](#bug-fixes-31)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
 # Changelog
 
+## v6.6.0
+
+### Enhancements
+
+* [#923](https://github.com/KronicDeth/intellij-elixir/pull/923) - [@KronicDeth](https://github.com/KronicDeth)
+  * EEx support
+    * Lexer for EEx format
+    * Parser for EEx format
+    * EEx as a Template Language
+      * Any file with `.eex` as the final extension will be treated as EEx.  To determine the Template Data Language, the `.eex` extension will be stripped and any remaining extension will be looked up to get the File Type and its associated Language.  For example, `*.txt.eex` will be EEx with Plain Text (`.txt`) as the Data Template Language.  Likewise, `*.html.eex` will be EEx with HTML as the Data Template Language.  There's no need to register `*.txt.eex` or `*.html.eex` or any other `*.DATA_TEMPLATE_LANGUAGE_EXTENSION.eex` pattern explicitly: the nested extension will be looked up using the normal extension setup.
+  * Update Build Matrix
+    * IDEA `2016.2` is dropped because it's over a year old.  It is still supported, but not actively tested.
+
 ## v6.5.1
 
 ### Bug Fixes
diff --git a/resources/META-INF/changelog.html b/resources/META-INF/changelog.html
index 63bd901a9..47eaffbe9 100644
--- a/resources/META-INF/changelog.html
+++ b/resources/META-INF/changelog.html
@@ -1,5 +1,41 @@
 <html>
 <body>
+<h1>v6.6.0</h1>
+<ul>
+  <li>
+    <p>Enhancements</p>
+    <ul>
+      <li>EEx support
+        <ul>
+          <li>Lexer for EEx format</li>
+          <li>Parser for EEx format</li>
+          <li>EEx as a Template Language
+            <ul>
+              <li>
+                Any file with <code>.eex</code> as the final extension will be treated as EEx.  To determine the
+                Template Data Language, the <code>.eex</code> extension will be stripped and any remaining extension
+                will be looked up to get the File Type and its associated Language.  For example, <code>*.txt.eex</code>
+                will be EEx with Plain Text (<code>.txt</code>) as the Data Template Language.  Likewise,
+                <code>*.html.eex</code> will be EEx with HTML as the Data Template Language.  There's no need to
+                register <code>*.txt.eex</code> or <code>*.html.eex</code> or any other
+                <code>*.DATA_TEMPLATE_LANGUAGE_EXTENSION.eex</code> pattern explicitly: the nested extension will be
+                looked up using the normal extension setup.
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </li>
+      <li>Update Build Matrix
+        <ul>
+          <li>
+            IDEA <code>2016.2</code> is dropped because it's over a year old.  It is still supported, but not actively
+            tested.
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </li>
+</ul>
 <h1>v6.5.1</h1>
 <ul>
   <li>