diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3f2c8a..021efaf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## v0.4.0
+
+* New features
+  * `NervesSSH.Options` now supports a `:name` key to use when starting the
+    SSH daemon. This allows a user to run multiple SSH daemons on the same
+    device without name conflicts (thanks @SteffenDE)
+
+* Fixed
+  * The SSH daemon could fail to start if the system/user directories were bad
+    or if the file system was not ready/mounted to support writing to disk. In
+    those cases, NervesSSH now attempts to write to tmpfs at
+    `/tmp/nerves_ssh/<original path>` to help prevent the daemon from crashing
+
 ## v0.3.0
 
 `NervesSSH` now requires Elixir >= 1.10 and OTP >=23
diff --git a/mix.exs b/mix.exs
index 3503341..3b1a5d0 100644
--- a/mix.exs
+++ b/mix.exs
@@ -1,7 +1,7 @@
 defmodule NervesSSH.MixProject do
   use Mix.Project
 
-  @version "0.3.0"
+  @version "0.4.0"
   @source_url "https://github.com/nerves-project/nerves_ssh"
 
   def project do