diff --git a/js/weechat.js b/js/weechat.js
index 640ccbd..4d06ff5 100644
--- a/js/weechat.js
+++ b/js/weechat.js
@@ -363,7 +363,8 @@
                 //   "*" + (A)STD + "," + EXT
                 //   "*" + (A)EXT + "," + STD
                 //   "*" + (A)EXT + "," + EXT
-                regex: /^\*(?:([\x01\x02\x03\x04*!\/_|]*)(\d{2})|@([\x01\x02\x03\x04*!\/_|]*)(\d{5})),(\d{2}|@\d{5})/,
+                // WeeChat 2.6+ use a tilde (~) instead of a comma (,) so recognise both
+                regex: /^\*(?:([\x01\x02\x03\x04*!\/_|]*)(\d{2})|@([\x01\x02\x03\x04*!\/_|]*)(\d{5}))[,~](\d{2}|@\d{5})/,
                 fn: function(m) {
                     var ret = {};