diff --git a/locales/en-US/chrome/chatzilla.properties b/locales/en-US/chrome/chatzilla.properties
--- a/locales/en-US/chrome/chatzilla.properties
+++ b/locales/en-US/chrome/chatzilla.properties
@@ -631,6 +631,10 @@
 cmd.rejoin.format = Rejoin $channelName
 cmd.rejoin.label  = Rejoin
 
+cmd.rename.params = [<label>]
+cmd.rename.help   = Change the label of the current tab to <label>.
+cmd.rename.label  = Rename Tab…
+
 cmd.server.params = <hostname> [<port> [<password>]]
 cmd.server.help   = Connects to server <hostname> on <port>, or 6667 if <port> is not specified.  Provides the password <password> if specified. If you are already connected, the view for <hostname> is made current.  If that view has been deleted, it is recreated.
 
@@ -1217,6 +1221,8 @@
 msg.retry.nick     = The nickname ``%S'' is already in use, trying ``%S''.
 msg.nick.prompt    = Enter a nickname to use:
 
+msg.tab.name.prompt = Enter a label for this tab:
+
 msg.list.rerouted  = List reply will appear on the ``%S'' view.
 msg.list.end       = Displayed %S of %S channels.
 msg.list.chancount = This server has %S channels. Listing them all will probably take a long time, and may lead to ChatZilla becoming unresponsive or being disconnected by the server. [[List Channels][List all channels][%S]]
diff --git a/xul/content/commands.js b/xul/content/commands.js
--- a/xul/content/commands.js
+++ b/xul/content/commands.js
@@ -133,6 +133,7 @@
          ["query",             cmdQuery,            CMD_NEED_SRV | CMD_CONSOLE],
          ["quit",              cmdQuit,                            CMD_CONSOLE],
          ["quote",             cmdQuote,            CMD_NEED_NET | CMD_CONSOLE],
+         ["rename",            cmdRename,                          CMD_CONSOLE],
          ["reload-plugin",     cmdReload,                          CMD_CONSOLE],
          ["rlist",             cmdRlist,            CMD_NEED_SRV | CMD_CONSOLE],
          ["reconnect",         cmdReconnect,        CMD_NEED_NET | CMD_CONSOLE],
@@ -1684,6 +1685,22 @@
     e.channel.join(e.channel.mode.key);
 }
 
+function cmdRename(e)
+{
+    var tab = getTabForObject(e.sourceObject);
+    if (!tab) {
+        feedback(e, getMsg(MSG_ERR_INTERNAL_DISPATCH, "rename"));
+        return;
+    }
+    var label = e.label || prompt(MSG_TAB_NAME_PROMPT, tab.label);
+    if (!label) {
+        return;
+    }
+    tab.label = label;
+    tab.setAttribute("tooltiptext", e.sourceObject.unicodeName);
+}
+
+
 function cmdTogglePref (e)
 {
     var state = !client.prefs[e.prefName];
diff --git a/xul/content/menus.js b/xul/content/menus.js
--- a/xul/content/menus.js
+++ b/xul/content/menus.js
@@ -411,6 +411,8 @@
          ["disconnect",  {visibleif: NetConnected}],
          ["reconnect",   {visibleif: NetDisconnected}],
          ["-"],
+         ["rename"],
+         ["-"],
          ["toggle-text-dir"]
         ]
     };