diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b913916..69baaab6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## v1.5.4
+
+* Enhancements
+  * Add `mix firmware.unpack` to unpack generated `.fw` files. This is useful
+    to inspect the contents of the target root filesystem and other .fw info
+    on the host.
+  * Update `mix burn` to accept the path to a `.fw` file with `--firmware | -i`.
+
+* Bug fixes
+  * Invoke `mix firmware` when calling `mix firmware.image`. This matches the
+    behavior of `mix firmware.burn`.
+  * Fix issue with artifact base_dir expansion. This fixes an issue where mix
+    would attempt to resolve the nerves dependency artifacts even though they
+    have already been downloaded.
+  * Always generate `erlinit.config`, even if there are no config override in
+    mix config. This fixes an issue where removing overrides from mix config
+    would not update the erlinit.config.
+
 ## v1.5.3
 
 * Bug fixes
diff --git a/mix.exs b/mix.exs
index 41333702..31059684 100644
--- a/mix.exs
+++ b/mix.exs
@@ -7,7 +7,7 @@ defmodule Nerves.Mixfile do
       name: "Nerves",
       source_url: "https://github.com/nerves-project/nerves",
       homepage_url: "http://nerves-project.org/",
-      version: "1.5.3",
+      version: "1.5.4",
       elixir: "~> 1.6.0 or ~> 1.7.3 or ~> 1.8",
       elixirc_paths: elixirc_paths(Mix.env()),
       deps: deps(),