diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40ffd18d..4b846317 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,18 +2,19 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## Unreleased
+## [v1.0.0-beta.11] - 2017-04-29
 ### Added
 - **Auth**: Azure AD authentication provider is now available
 - **Auth**: Can now specify Read Access by default for all providers (except Local)
-- **View**: MathML and TeX math equations support
 - **Configuration Wizard**: Added Public Access option
-- **Misc**: Heroku support
+- **Git**: Commits author is now set to current user
 - **Navigation**: All Pages section
 - **UI**: Beatiful new logo!
+- **View**: MathML and TeX math equations support
 
 ### Changed
 - **Auth**: Provider Strategies are now only loaded if enabled
+- **Misc**: Server files are now in their own /server path
 - **Misc**: Trailing slashes in URL are now removed
 - **Misc**: Updated dependencies
 - **UI**: Footer is now always at the bottom of the page (but not fixed)
diff --git a/README.md b/README.md
index c63f02b5..2fb6ddd1 100644
--- a/README.md
+++ b/README.md
@@ -50,11 +50,15 @@ Current and upcoming milestones *(features only, see the [changelog](https://git
 - [x] Azure AD authentication
 - [x] MathML / Tex math equations
 - [x] Support for CJK (Chinese, Japanese & Korean) characters in content, meta and uploads
-- [ ] All Pages section
-- [ ] Heroku support
+- [x] All Pages section
 
 ### Beta 12
 
+- [ ] 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