diff --git a/CHANGELOG.md b/CHANGELOG.md
index c872eac..c04e049 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,58 @@ layout: default
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.4.0]
+
+### Added
+
+- Icon for files modified outside emacs (from Font Awesome).
+- Icon for files that are being modified by another user (from Font
+  Awesome).
+- Icicle minor mode icon.
+- Auto complete minor mode icon (from Font Awesome).
+- Another icon for buffers with Mac OS line-endings (from IcoMoon
+  Free).
+- Flyspell minor mode icon (from IcoMoon Free).
+- Ergoemacs minor mode icon (from Font Awesome).
+- Messages mode icon (from Font Awesome).
+- Conf mode icon (from Font Awesome).
+- Fundamental mode icon (from Font Awesome).
+- Dockerfile mode icon.
+- Drag stuff minor mode icon (from Font Awesome).
+- Helm minor mode icon.
+- Javascript-IDE mode (js2-mode) icon.
+- Auto indent minor mode (from Font Awesome)
+- Automatic setup of arbitrary font, currently still support
+  IcoMoon-Free, FontAwesome, font-mfizz and github-octicons.
+
+### Changed
+
+- Mode names in mode icon specifications are now case-sensitive.
+- All mode names in mode icon specifications have changed to only
+  match the complete name, not a partial name.
+- C, C++, C#, PHP and Java modes match a wider variety of modes.  See
+  (Issue #18).
+- Allow black and white xpm icons to match the mode-line face colors
+  (both active and inactive, for major and minor modes)
+- Allow displaying the major mode name in the mode-line only, or both
+  the mode-line and in other buffers, like ibuffer.
+  - If the `mode-name` variable is changed, then anything that looks
+    at this variable will pick up the icon.
+  - This can be customized by the variable
+    `mode-icons-change-mode-name`.
+  - This should be modified for packages like =powerline= and
+    `smart-mode-line`.
+- Allow desaturating and matching the mode-line face colors for xpm
+  images.
+- Allow emojis to be used as mode-icons
+- Allow font icons to be used without the font.
+- Add gimp inferior buffer to generate images for mode-icons,
+  preferring the xpm format.
+
+### Removed
+
+- The option to hide major mode names.
+
 ## [0.3.0]
 
 ### Added
@@ -100,6 +152,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Customization options.
 - Lisp Interaction mode icon.
 
-[Unreleased]: https://github.com/ryuslash/mode-icons/compare/0.3.0...HEAD
+[0.4.0]: https://github.com/ryuslash/mode-icons/compare/0.3.0...0.4.0
 [0.3.0]: https://github.com/ryuslash/mode-icons/compare/0.2.0...0.3.0
 [0.2.0]: https://github.com/ryuslash/mode-icons/compare/0.1.0...0.2.0