diff --git a/ChangeLog b/ChangeLog
index c2b69f69a..88ae4d5af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.8-dev, 2012-04-11
+v0.3.8-dev, 2012-04-17
 
 
 Version 0.3.8 (under dev!)
@@ -59,6 +59,8 @@ Version 0.3.8 (under dev!)
   ison, list, names, topic, who, whois, whowas, time, userhost) (bug #33516)
 * relay: add "date_printed" and "highlight" in signal "_buffer_line_added"
   (WeeChat protocol)
+* rmodifier: add default rmodifier "server" to hide passwords in commands
+  /server and /connect (task #11993)
 * rmodifier: add option "release" in default rmodifier "nickserv" (used to hide
   passwords in command "/msg nickserv") (bug #35705)
 * tcl: add missing function "hdata_char" in API
diff --git a/src/plugins/rmodifier/rmodifier-config.c b/src/plugins/rmodifier/rmodifier-config.c
index 075af199f..80246b537 100644
--- a/src/plugins/rmodifier/rmodifier-config.c
+++ b/src/plugins/rmodifier/rmodifier-config.c
@@ -41,6 +41,9 @@ char *rmodifier_config_default_list[][4] =
     { "nickserv", "history_add,input_text_display",
       "^(/(msg|quote) +nickserv +(id|identify|ghost \\S+|release \\S+) +)(.*)", "1,4*"
     },
+    { "server", "history_add,input_text_display",
+      "^(/(server|connect) .*-(sasl_)?password=)(\\S+)(.*)", "1,4*,5"
+    },
     { "oper", "history_add,input_text_display",
       "^(/oper +\\S+ +)(.*)", "1,2*"
     },