diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b846317..c97e2a5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,24 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Unrelease
+### Added
+- **History**: History section to list all changes
+- **Localization**: All UI text elements are now localized
+- **Localization**: Chinese locale is now available (thanks to @choicky)
+
+### Changed
+- **Misc**: Updated dependencies
+- **UI**: Reveal 'Top of Page' only on scroll + icon only
+
+### Fixed
+- **Configuration Wizard**: Public option is now saved properly in config file
+- **Configuration Wizard**: Git check no longer fails when unable to remove existing remotes
+- **Editor**: Large size content can now be saved up to 1 MB
+- **Misc**: Empty anchors no longer crash the rendering process
+- **UI**: Markdown is now stripped from page contents items
+- **UI**: Page contents no longer disappear when scrolling down
+
 ## [v1.0.0-beta.11] - 2017-04-29
 ### Added
 - **Auth**: Azure AD authentication provider is now available
diff --git a/README.md b/README.md
index 95844c5c..61107014 100644
--- a/README.md
+++ b/README.md
@@ -55,13 +55,13 @@ Current and upcoming milestones *(features only, see the [changelog](https://git
 
 ### Beta 12
 
+- [ ] Better localization in the UI
 - [ ] Docker support + Auto compile/publish to Docker Hub
 - [ ] Heroku support
 
 ### Beta 13
 
 - [ ] Insert Link modal in Editor
-- [ ] Better localization in the UI
 - [ ] Better simultaneous user editing handling
 - [ ] Preview changes directly from the editor, without saving
 - [ ] Upgrade from web UI