diff --git a/Documentation/Reference/MaxAdmin.md b/Documentation/Reference/MaxAdmin.md
index 8dc5a941d..107ac2502 100644
--- a/Documentation/Reference/MaxAdmin.md
+++ b/Documentation/Reference/MaxAdmin.md
@@ -1,5 +1,7 @@
 # MaxAdmin - Admin Interface
 
+**NOTE:** MaxAdmin is deprecated, use [MaxCtrl](./MaxCtrl.md) instead.
+
 # The Maxscale Administrative & Monitoring Client Application
 
  - [Overview](#overview)
diff --git a/Documentation/Release-Notes/MaxScale-2.3.1-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.3.1-Release-Notes.md
index c5c6647da..7f3555d8e 100644
--- a/Documentation/Release-Notes/MaxScale-2.3.1-Release-Notes.md
+++ b/Documentation/Release-Notes/MaxScale-2.3.1-Release-Notes.md
@@ -38,7 +38,7 @@ release. The functionality in `mmmon` has been largely obsoleted by the
 advancements in `mariadbmon`. The `ndbclustermon` is largely obsolete due to the
 fact that there are virtually no users who use it.
 
-### Deprecated options
+## Deprecated features
 
 The following configuration file options have been deprecated and will
 be removed in 2.4.
@@ -53,8 +53,19 @@ be removed in 2.4.
 
 ### MaxAdmin
 
-The commands `set pollsleep` and `set nbpolls` have been deprecated and
-will be removed in 2.4.
+MaxAdmin has been deprecated in favor of the REST API and MaxCtrl. It will be
+removed in a later release.
+
+In addition to this the commands `set pollsleep` and `set nbpolls` have been
+deprecated and will be removed already in 2.4.
+
+### MaxInfo
+
+The `maxinfo` router has been deprecated and will be removed in a later release.
+
+### Debugcli
+
+The `debugcli` module has been deprecated and will be removed in 2.4.
 
 ## New Features
 
diff --git a/server/modules/routing/cli/cli.cc b/server/modules/routing/cli/cli.cc
index fe52a3c91..599d33167 100644
--- a/server/modules/routing/cli/cli.cc
+++ b/server/modules/routing/cli/cli.cc
@@ -63,7 +63,7 @@ extern int execute_cmd(CLI_SESSION* cli);
  */
 extern "C" MXS_MODULE* MXS_CREATE_MODULE()
 {
-    MXS_NOTICE("Initialise CLI router module");
+    MXS_WARNING("THE 'cli' MODULE AND 'maxadmin' ARE DEPRECATED: Use 'maxctrl' instead");
 
     static MXS_ROUTER_OBJECT MyObject =
     {
diff --git a/server/modules/routing/debugcli/debugcli.cc b/server/modules/routing/debugcli/debugcli.cc
index c5b912af7..07bc1a7e4 100644
--- a/server/modules/routing/debugcli/debugcli.cc
+++ b/server/modules/routing/debugcli/debugcli.cc
@@ -65,7 +65,7 @@ static CLI_INSTANCE* instances;
  */
 extern "C" MXS_MODULE* MXS_CREATE_MODULE()
 {
-    MXS_NOTICE("Initialise debug CLI router module.");
+    MXS_WARNING("THE 'debugcli' MODULE IS DEPRECATED");
     pthread_mutex_init(&instlock, NULL);
     instances = NULL;
 
diff --git a/server/modules/routing/maxinfo/maxinfo.cc b/server/modules/routing/maxinfo/maxinfo.cc
index ec79fda80..523c6a057 100644
--- a/server/modules/routing/maxinfo/maxinfo.cc
+++ b/server/modules/routing/maxinfo/maxinfo.cc
@@ -93,7 +93,7 @@ static INFO_INSTANCE* instances;
  */
 extern "C" MXS_MODULE* MXS_CREATE_MODULE()
 {
-    MXS_NOTICE("Initialise MaxInfo router module.");
+    MXS_WARNING("THE 'maxinfo' MODULE IS DEPRECATED");
     pthread_mutex_init(&instlock, NULL);
     instances = NULL;