diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 3733fb2db99f..2e6aca29512c 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -30,6 +30,53 @@
This document describes the changes made to the ERTS application.
+Erts 5.8.4.1
+
+ Fixed Bugs and Malfunctions
+
+ -
+
+ Fix bug in tracing with matchspec body containing
+ enable_trace or disable_trace. Could cause
+ emulator crash if trace was altered with
+ erlang:trace_pattern by racing process during ongoing
+ tracing.
+
+ Own Id: OTP-9422 Aux Id: seq11868
+
+ -
+
+ Fix emulator deadlock in ets:delete on tables with
+ write_concurrency caused by race with concurrent
+ process that tries to do other operation on the same
+ table. Does not apply to ordered_set. Bug exist
+ since R14B.
+
+ Own Id: OTP-9423 Aux Id: seq11872
+
+
+
+
+
+ Improvements and New Features
+
+ -
+
+ The erts_alloc_util framework has been extended
+ with functionality for separation of small blocks from
+ other blocks in separate carriers. This functionality is
+ currently disabled by default, but can be enabled in
+ order to finetune memory management. For more information
+ see erts_alloc(3).
+
+ Own Id: OTP-9339 Aux Id: Seq11780
+
+
+
+
+
+
Erts 5.8.4
Fixed Bugs and Malfunctions
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 193a914a709a..6be703d453f9 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -17,7 +17,7 @@
# %CopyrightEnd%
#
-VSN = 5.8.4
+VSN = 5.8.4.1
SYSTEM_VSN = R14B03
# Port number 4365 in 4.2