--- a/js/tests/ircbot.js
+++ b/js/tests/ircbot.js
@@ -82,18 +82,18 @@ function initStatic()
 /*
  * One time initilization stuff
  */
 function init(obj)
 { 
     obj.eventPump = new CEventPump(100);
 
     obj.networks = new Object();
-    obj.networks["moznet"] =
-        new CIRCNetwork("moznet", [{name: "irc.mozilla.org", port: 6667}],
+    obj.networks["freenode"] =
+        new CIRCNetwork("freenode", [{name: "chat.freenode.net", port: 6667}],
                         obj.eventPump);
 
     obj.networks["efnet"] =
         new CIRCNetwork ("efnet", [{name: "irc.mcs.net", port: 6667},
                                    {name: "irc.cs.cmu.edu",   port: 6667}],
                          obj.eventPump);
 
     obj.primNet = obj.networks["efnet"];

--- a/js/tests/mingus.js
+++ b/js/tests/mingus.js
@@ -10,17 +10,17 @@ bot.personality.guessActionPrefixes = ["
                                       "tries ","pretends ", "", ""];
 
 function initMingus()
 {
     //XXX You should add the owner(s) of the bot here. You can do so with a
     // regular expression which matches their hostmask, like so:
     // addOwner(/rginda.*!.*@.*netscape\.com$/i);
 
-    bot.primNet = bot.networks["moznet"];
+    bot.primNet = bot.networks["freenode"];
 
     load("DP.js");
     CIRCNetwork.prototype.INITIAL_NICK = "mingus";
     CIRCNetwork.prototype.INITIAL_NAME = "mingus";
     CIRCNetwork.prototype.INITIAL_DESC = "real men do it with prototypes";
     CIRCNetwork.prototype.INITIAL_CHANNEL = "#chatzilla";
 
     CIRCChannel.prototype.onJoin =

--- a/locales/en-US/chrome/chatzilla.properties
+++ b/locales/en-US/chrome/chatzilla.properties
@@ -89,17 +89,17 @@ cmd.about-config.help   =
 
 cmd.about.label = About ChatZilla
 cmd.about.help  = Display information about this version of ChatZilla.
 
 cmd.alias.params = [<alias-name> [<command-list>]]
 cmd.alias.help   = Defines <alias-name> as an alias for the semicolon (';') delimited list of commands specified by <command-list>.  If <command-list> is a minus ('-') character, the alias will be removed; if omitted, the alias will be displayed. If <alias-name> is not provided, all aliases will be listed.
 
 cmd.attach.params = <irc-url>
-cmd.attach.help   = Attaches to the IRC URL specified by <irc-url>.  If you are already attached, the view for <irc-url> is made current.  If that view has been deleted, it is recreated.  You may omit the irc:// portion of the <irc-url>.  Examples are; /attach moznet, /attach moznet/chatzilla, and /attach irc.mozilla.org/mozbot,isnick.
+cmd.attach.help   = Attaches to the IRC URL specified by <irc-url>.  If you are already attached, the view for <irc-url> is made current.  If that view has been deleted, it is recreated.  You may omit the irc:// portion of the <irc-url>.  Examples are; /attach freenode, /attach freenode/firefox and /attach irc.freenode.net/SeaMonkey,isnick.
 
 cmd.away.label  = Away (default)
 cmd.away.format = Away ($reason)
 cmd.away.params = [<reason>]
 cmd.away.help   = If <reason> is specified, sets you away with that message. Used without <reason>, you are marked away with a default message.
 
 cmd.back.label  = Back
 cmd.back.params =

--- a/xul/content/networks.js
+++ b/xul/content/networks.js
@@ -2,21 +2,25 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 function initNetworks()
 {
     var networks = new Object();
 
     // Set up default network list.
-    networks["moznet"] = {
-        displayName:  "moznet",
-        isupportsKey: "Mozilla",
-        servers: [{hostname: "irc.mozilla.org", port:6667},
-                  {hostname: "irc.mozilla.org", port:6697, isSecure: true}]};
+    networks["freenode"] = {
+        displayName:  "freenode",
+        isupportsKey: "",
+        servers: [{hostname: "chat.freenode.net", port:6667},
+                  {hostname: "chat.freenode.net", port:7000, isSecure: true},
+                  // XXX irc.freenode.net is only here until we can link servers
+                  // to networks without them being in the network's server list
+                  {hostname: "irc.freenode.net", port:6667},
+                  {hostname: "irc.freenode.net", port:7000, isSecure: true}]};
    networks["slashnet"] = {
         displayName:  "slashnet",
         isupportsKey: "",
         servers: [{hostname: "irc.slashnet.org", port:6667}]};
     networks["dalnet"] = {
         displayName:  "dalnet",
         isupportsKey: "",
         servers: [{hostname: "irc.dal.net", port:6667}]};
@@ -31,25 +35,16 @@ function initNetworks()
     networks["quakenet"] = {
         displayName:  "quakenet",
         isupportsKey: "",
         servers: [{hostname: "irc.quakenet.org", port:6667}]};
     networks["ircnet"] = {
         displayName:  "ircnet",
         isupportsKey: "",
         servers: [{hostname: "ircnet.eversible.com", port:6667}]};
-    networks["freenode"] = {
-        displayName:  "freenode",
-        isupportsKey: "",
-        servers: [{hostname: "chat.freenode.net", port:6667},
-                  {hostname: "chat.freenode.net", port:7000, isSecure: true},
-                  // XXX irc.freenode.net is only here until we can link servers
-                  // to networks without them being in the network's server list
-                  {hostname: "irc.freenode.net", port:6667},
-                  {hostname: "irc.freenode.net", port:7000, isSecure: true}]};
     networks["serenia"] = {
         displayName:  "serenia",
         isupportsKey: "",
         servers: [{hostname: "chat.serenia.net", port:9999, isSecure: true}]};
     networks["efnet"] = {
         displayName:  "efnet",
         isupportsKey: "",
         servers: [{hostname: "irc.prison.net", port: 6667},

--- a/xul/content/static.js
+++ b/xul/content/static.js
@@ -1,17 +1,17 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Components.utils.import("resource://gre/modules/Services.jsm");
 
-const __cz_version   = "0.9.94";
+const __cz_version   = "0.9.95";
 const __cz_condition = "green";
 const __cz_suffix    = "";
 const __cz_guid      = "59c81df5-4b7a-477b-912d-4e0fdf64e5f2";
 const __cz_locale    = "0.9.92";
 
 var warn;
 var ASSERT;
 var TEST;
@@ -1769,18 +1769,18 @@ var testURLs = [
     "irc://foo:6666",
     "irc://foo:6666/",
     "irc://irc.foo.org",
     "irc://irc.foo.org/",
     "irc://irc.foo.org/,needpass",
     "irc://irc.foo.org/?msg=hello%20there",
     "irc://irc.foo.org/?msg=hello%20there&ignorethis",
     "irc://irc.foo.org/%23mozilla,needkey?msg=hello%20there&ignorethis",
-    "irc://moznet/",
-    "irc://moznet/,isserver",
+    "irc://freenode/",
+    "irc://freenode/,isserver",
     "irc://[fe80::5d49:767b:4b68:1b17]",
     "irc://[fe80::5d49:767b:4b68:1b17]/",
     "irc://[fe80::5d49:767b:4b68:1b17]:6666",
     "irc://[fe80::5d49:767b:4b68:1b17]:6666/"
 ];
 
 var testFailURLs = [
     "irc:///",