diff --git a/Documentation/Changelog.md b/Documentation/Changelog.md
index f2bc3fbac..5cd7b8fa2 100644
--- a/Documentation/Changelog.md
+++ b/Documentation/Changelog.md
@@ -1,7 +1,4 @@
 #Changelog
-## MariaDB MaxScale 2.1
-* MaxAdmin now defaults to Emacs editing mode instead of VIM. To activate VIM mode start
-  MaxAdmin with -i.
 
 ## MariaDB MaxScale 2.0
 * MariaDB MaxScale is licensed under MariaDB BSL.
diff --git a/Documentation/Release-Notes/MaxScale-2.1.0-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.1.0-Release-Notes.md
index 7a7e11cc7..9b30d4244 100644
--- a/Documentation/Release-Notes/MaxScale-2.1.0-Release-Notes.md
+++ b/Documentation/Release-Notes/MaxScale-2.1.0-Release-Notes.md
@@ -120,6 +120,11 @@ can be taken into use by disabling the new `root_node_as_master` option.
 
 For more details, read the [Galeramon documentation](../Monitors/Galera-Monitor.md).
 
+### MaxAdmin editing mode
+
+MaxAdmin now defaults to Emacs editing mode instead of VIM. To activate
+with VIM-mode start MaxAdmin with option -i.
+
 ## New Features
 
 ### Dynamic server configuration