diff --git a/docs/help/in/disconnect.in b/docs/help/in/disconnect.in
index ace1a3df..bd4a4e17 100644
--- a/docs/help/in/disconnect.in
+++ b/docs/help/in/disconnect.in
@@ -10,10 +10,11 @@
 
 %9Description:%9
 
-    Disconnects from one or more IRC servers; the list of all the servers you
-    are connected to can be retrieved via the SERVER command.
+    Disconnects from an IRC server; the list of all the servers you are
+    connected to can be retrieved via the SERVER command.
 
-    Use the wildcard character '*' if you want to disconnect from all servers.
+    Use the wildcard character '*' if you want to disconnect from the active
+    server.
 
 %9Examples:%9
 
diff --git a/docs/help/in/msg.in b/docs/help/in/msg.in
index dc70f1f3..9e0879e4 100644
--- a/docs/help/in/msg.in
+++ b/docs/help/in/msg.in
@@ -11,6 +11,9 @@
 
     The target nickname or channel and the message to send.
 
+    Use the wildcard character '*' if you want to use the active nickname or
+    channel.
+
 %9Description:%9
 
     Sends a message to a nickname or channel.
@@ -19,6 +22,7 @@
 
     /MSG mike Hi, what's up?
     /MSG #irssi I am awesome :)
+    /MSG * Do you want to build a snowman?
 
 %9See also:%9 ACTION, DCC, JOIN
 
diff --git a/src/core/chat-commands.c b/src/core/chat-commands.c
index 235a9fc4..8d1ac3eb 100644
--- a/src/core/chat-commands.c
+++ b/src/core/chat-commands.c
@@ -321,7 +321,7 @@ static void cmd_quit(const char *data)
 	signal_emit("gui exit", 0);
 }
 
-/* SYNTAX: MSG [-<server tag>] [-channel | -nick] <targets> <message> */
+/* SYNTAX: MSG [-<server tag>] [-channel | -nick] *|<targets> <message> */
 static void cmd_msg(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
 {
 	GHashTable *optlist;