diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4213302dcb06..1bb70b7309ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,30 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.0.4] - 2017-12-27
+
+This is generally a bug fix release, with some code refactoring. Total commits in this release is 58.
+
+### Breaking Changes
+
+- ***Most users may not run into this problem, but we think it can technically be a breaking change***. PR #322 (original PR #316) and friends changes the way we check for the existence of translations and versioning. Part of that is that we allow for the possibility of an empty language prop, instead of defaulting everything to English. When running 1.0.4, check to make sure your `index.js` works as expected. See [this comment](https://github.com/facebook/Docusaurus/pull/322#issuecomment-352914064) and those below for discussion on this. There is still a bit more work to be done (refactoring and maybe adding a `defaultLang` config option) to make this as clean as possible.
+
+### Added
+
+- `lang` property added on `html` tag, if a language exists and is set (PR #295).
+- Added the `wrapPagesHTML` configuration option (PR #332).
+- Some adming docs on how to debug with VSCode (PR #335).
+- Added docs for the `useEnglishURL` configuration option.
+
+### Fixed/Changed
+
+- Links on landing page in `docusaurus-init` test site do not 404 any longer.
+- Refactoring how we check for translations and versioning (PRs #322/#316 and friends).
+- Refactored the example `index.js` page (PR #293).
+- Link errors, typos and grammatical errors in the docusuarus.io documentation.
+
+### Removed
+
 ## [1.0.3] - 2017-12-13
 ### Added
 - Docusaurus [released](http://docusaurus.io/blog/2017/12/14/introducing-docusaurus.html) to the public.
@@ -16,4 +40,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
   - Blog
   - Documentation
 
-[Unreleased]: https://github.com/facebook/Docusaurus/compare/v1.0.3...HEAD
+[Unreleased]: https://github.com/facebook/Docusaurus/compare/v1.0.4...HEAD
+[1.0.4]: https://github.com/olivierlacan/keep-a-changelog/compare/v1.0.3...v1.0.4
diff --git a/package-lock.json b/package-lock.json
index 2f021020f8c7..cdf53b618bc2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "docusaurus",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ca1d8b77fc86..e36b1a3e4e63 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "docusaurus",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "license": "MIT",
   "keywords": [
     "documentation",