diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63458e51c0..4a3e7a41fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [v1.0.12] - 2017-11-26
+### Added
+- **Localization**: Estonian locale is now available (thanks to @vonforum)
+
+### Changed
+- **Localization**: Updates to various locales
+- **Misc**: Added quotes to sample Slack config to avoid number parsing
+
+## Fixed
+- **Git**: ignore .git directory when updating cache
+
 ## [v1.0.11] - 2017-10-14
 ### Added
 - **Localization**: Japanese locale is now available (thanks to @johnnyshields)
@@ -237,6 +248,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Updated dependencies + snyk policy
 
+[v1.0.12]: https://github.com/Requarks/wiki/releases/tag/v1.0.11
 [v1.0.11]: https://github.com/Requarks/wiki/releases/tag/v1.0.11
 [v1.0.10]: https://github.com/Requarks/wiki/releases/tag/v1.0.10
 [v1.0.9]: https://github.com/Requarks/wiki/releases/tag/v1.0.9
diff --git a/README.md b/README.md
index 226d4941b1..5f2599aeb0 100644
--- a/README.md
+++ b/README.md
@@ -65,14 +65,15 @@ Wiki.js documentation site is actually running Wiki.js! [Check it out »](h
 
 Current and upcoming milestones *(major features only, see the [changelog](https://github.com/Requarks/wiki/blob/master/CHANGELOG.md) for complete list of features and bug fixes)*:
 
-### 1.0.11 - Stable
+### 1.0.12 - Stable
 ![Progress](http://progressed.io/bar/100)
 
 **Note**: As 2.0 is under development, no new features are being developed in the 1.0 branch.
 
-- [x] Japanese localization
-- [x] Fix for name search when using OpenLDAP
-- [x] Added referrer policy header
+- [x] Estonian locale is now available (thanks to @vonforum)
+- [x] Updates to various locales
+- [x] Added quotes to sample Slack config to avoid number parsing
+- [x] Fix: Ignore .git directory when updating cache
 
 ### 2.0.0 - Dev
 ![Progress](http://progressed.io/bar/40)
diff --git a/package.json b/package.json
index ef84b9e149..7a9cf9f1b3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wiki",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown",
   "main": "wiki.js",
   "scripts": {
diff --git a/server/app/data.yml b/server/app/data.yml
index 17c1e685a7..9eaea86081 100644
--- a/server/app/data.yml
+++ b/server/app/data.yml
@@ -96,6 +96,9 @@ langs:
   -
     id: nl
     name: Dutch - Nederlands
+  -
+    id: et
+    name: Estonian - Eesti keel
   -
     id: fr
     name: French - Français