diff --git a/CHANGELOG b/CHANGELOG
index c94786647..17156c55a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 mkdocs-material-2.6.4 (2018-02-21)
 
+  * Added Catalan translations
   * Fixed incorrect margins for buttons in Firefox and Safari
   * Replaced package manager yarn with npm 5.6
   * Reverted GitHub stars rounding method
diff --git a/README.md b/README.md
index e2e364c8c..df6a6b2b1 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ theme:
 ## What to expect
 
 * Responsive design and fluid layout for all kinds of screens and devices,
-  designed to serve your project documentation in a user-friendly way in 22
+  designed to serve your project documentation in a user-friendly way in 23
   languages with optimal readability.
 
 * Easily customizable primary and accent color, fonts, favicon and logo;
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 8d2b4a198..c56be3ea8 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -313,33 +313,36 @@ translations for all template variables and labels in the following languages:
   <tbody>
     <tr>
       <td><code>ar</code> / Arabic</td>
+      <td><code>ca</code> / Catalan</td>
       <td><code>da</code> / Danish</td>
       <td><code>nl</code> / Dutch</td>
-      <td><code>en</code> / English</td>
     </tr>
     <tr>
+      <td><code>en</code> / English</td>
       <td><code>fr</code> / French</td>
       <td><code>de</code> / German</td>
       <td><code>hu</code> / Hungarian</td>
-      <td><code>it</code> / Italian</td>
     </tr>
     <tr>
+      <td><code>it</code> / Italian</td>
       <td><code>ja</code> / Japanese</td>
       <td><code>kr</code> / Korean</td>
       <td><code>no</code> / Norwegian</td>
-      <td><code>fa</code> / Persian</td>
     </tr>
     <tr>
+      <td><code>fa</code> / Persian</td>
       <td><code>pl</code> / Polish</td>
       <td><code>pt</code> / Portugese</td>
       <td><code>ru</code> / Russian</td>
-      <td><code>es</code> / Spanish</td>
     </tr>
     <tr>
+      <td><code>es</code> / Spanish</td>
       <td><code>sv</code> / Swedish</td>
       <td><code>tr</code> / Turkish</td>
       <td><code>uk</code> / Ukrainian</td>
-      <td><code>vi</code> / Vietnamese</td>
+    </tr>
+    <tr>
+      <td colspan="4"><code>vi</code> / Vietnamese</td>
     </tr>
     <tr>
       <td colspan="2">
diff --git a/docs/index.md b/docs/index.md
index 6a4fbb367..33473571e 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -34,7 +34,7 @@ theme:
 ## What to expect
 
 * Responsive design and fluid layout for all kinds of screens and devices,
-  designed to serve your project documentation in a user-friendly way in 22
+  designed to serve your project documentation in a user-friendly way in 23
   languages with optimal readability.
 
 * Easily customizable primary and accent color, fonts, favicon and logo;
diff --git a/docs/release-notes.md b/docs/release-notes.md
index 34f15d5ff..ea33816fb 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -37,6 +37,14 @@ pip show mkdocs-material
 
 ## Changelog
 
+### 2.6.4 <small>_ February 21, 2018</small>
+
+* Added Catalan translations
+* Fixed incorrect margins for buttons in Firefox and Safari
+* Replaced package manager `yarn` with `npm 5.6`
+* Reverted GitHub stars rounding method
+* Removed `--dev-addr` flag from `Dockerfile` for Windows compatibility
+
 ### 2.6.3 <small>_ February 18, 2018</small>
 
 * Added Vietnamese translations
diff --git a/material/partials/language/ca.html b/material/partials/language/ca.html
new file mode 100644
index 000000000..aa7bccb9e
--- /dev/null
+++ b/material/partials/language/ca.html
@@ -0,0 +1,19 @@
+{% macro t(key) %}{{ {
+  "language": "ca",
+  "clipboard.copy": "Còpia al porta-retalls",
+  "clipboard.copied": "Copiat al porta-retalls",
+  "edit.link.title": "Edita aquesta pàgina",
+  "footer.previous": "Anterior",
+  "footer.next": "Següent",
+  "meta.comments": "Comentaris",
+  "meta.source": "Codi font",
+  "search.language": "",
+  "search.placeholder": "Cerca",
+  "search.result.placeholder": "Escriu per a començar a cercar",
+  "search.result.none": "Cap document coincideix",
+  "search.result.one": "1 document coincident",
+  "search.result.other": "# documents coincidents",
+  "skip.link.title": "Salta el contingut",
+  "source.link.title": "Ves al repositori",
+  "toc.title": "Taula de continguts"
+}[key] }}{% endmacro %}
diff --git a/src/partials/language/ca.html b/src/partials/language/ca.html
new file mode 100644
index 000000000..92eb33e3b
--- /dev/null
+++ b/src/partials/language/ca.html
@@ -0,0 +1,42 @@
+<!--
+  Copyright (c) 2016-2018 Martin Donath <martin.donath@squidfunk.com>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to
+  deal in the Software without restriction, including without limitation the
+  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+  sell copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+  IN THE SOFTWARE.
+-->
+
+<!-- Translations: Catalan -->
+{% macro t(key) %}{{ {
+  "language": "ca",
+  "clipboard.copy": "Còpia al porta-retalls",
+  "clipboard.copied": "Copiat al porta-retalls",
+  "edit.link.title": "Edita aquesta pàgina",
+  "footer.previous": "Anterior",
+  "footer.next": "Següent",
+  "meta.comments": "Comentaris",
+  "meta.source": "Codi font",
+  "search.language": "",
+  "search.placeholder": "Cerca",
+  "search.result.placeholder": "Escriu per a començar a cercar",
+  "search.result.none": "Cap document coincideix",
+  "search.result.one": "1 document coincident",
+  "search.result.other": "# documents coincidents",
+  "skip.link.title": "Salta el contingut",
+  "source.link.title": "Ves al repositori",
+  "toc.title": "Taula de continguts"
+}[key] }}{% endmacro %}