diff --git a/mozilla/extensions/irc/xpi/locale-resources/install.rdf b/mozilla/extensions/irc/xpi/locale-resources/install.rdf
index dd0675599ba..6d8a759296a 100644
--- a/mozilla/extensions/irc/xpi/locale-resources/install.rdf
+++ b/mozilla/extensions/irc/xpi/locale-resources/install.rdf
@@ -31,6 +31,15 @@
 			</Description>
 		</em:targetApplication>
 		
+		<!-- target: Flock, version 0.4 - 1.0+ -->
+		<em:targetApplication>
+			<Description>
+				<em:id>{a463f10c-3994-11da-9945-000d60ca027b}</em:id>
+				<em:minVersion>0.4</em:minVersion>
+				<em:maxVersion>1.0+</em:maxVersion>
+			</Description>
+		</em:targetApplication>
+
 		<!-- front-end metadata -->
 		<em:name>ChatZilla @LOCALE@ localization</em:name>
 		<em:description>ChatZilla Localization.</em:description>
diff --git a/mozilla/extensions/irc/xpi/resources/install.rdf b/mozilla/extensions/irc/xpi/resources/install.rdf
index 5eec682a95c..320e41f3867 100644
--- a/mozilla/extensions/irc/xpi/resources/install.rdf
+++ b/mozilla/extensions/irc/xpi/resources/install.rdf
@@ -22,6 +22,15 @@
 				<em:maxVersion>1.6</em:maxVersion>
 			</Description>
 		</em:targetApplication>
+
+		<!-- target: Flock, version 0.4 - 1.0+ -->
+		<em:targetApplication>
+			<Description>
+				<em:id>{a463f10c-3994-11da-9945-000d60ca027b}</em:id>
+				<em:minVersion>0.4</em:minVersion>
+				<em:maxVersion>1.0+</em:maxVersion>
+			</Description>
+		</em:targetApplication>
 		
 		<!-- front-end metadata -->
 		<em:name>ChatZilla</em:name>
diff --git a/mozilla/extensions/irc/xul/content/static.js b/mozilla/extensions/irc/xul/content/static.js
index ae1918eab98..c2953ab4369 100644
--- a/mozilla/extensions/irc/xul/content/static.js
+++ b/mozilla/extensions/irc/xul/content/static.js
@@ -161,7 +161,7 @@ function init()
     initApplicationCompatibility();
     initMessages();
     if (client.host == "")
-        showErrorDlg(getMsg(MSG_ERR_UNKNOWN_HOST, getBrowserURL()));
+        showErrorDlg(getMsg(MSG_ERR_UNKNOWN_HOST, client.unknownUID));
 
     initRDF();
     initCommands();
@@ -423,7 +423,12 @@ function initApplicationCompatibility()
                 client.host = "Mozilla";
                 client.hostCompat.typeChromeBrowser = true;
                 break;
+            case "{a463f10c-3994-11da-9945-000d60ca027b}": // Flock
+                client.host = "Flock";
+                client.hostCompat.typeChromeBrowser = true;
+                break;
             default:
+                client.unknownUID = app.ID;
                 client.host = ""; // Unknown host, show an error later.
         }
     }
@@ -491,7 +496,7 @@ function initIcons()
      * In XULRunner, things are more fun, as we're not an extension.
      */
     var sourceDir;
-    if (client.host == "Firefox")
+    if ((client.host == "Firefox") || (client.host == "Flock"))
     {
         sourceDir = getSpecialDirectory("ProfD");
         sourceDir.append("extensions");
diff --git a/mozilla/extensions/irc/xul/locale/en-US/chatzilla.properties b/mozilla/extensions/irc/xul/locale/en-US/chatzilla.properties
index 694d40857c8..73870feccf6 100644
--- a/mozilla/extensions/irc/xul/locale/en-US/chatzilla.properties
+++ b/mozilla/extensions/irc/xul/locale/en-US/chatzilla.properties
@@ -734,7 +734,7 @@ msg.err.offline       = The host software platform (e.g. Mozilla, Firefox) is in
 msg.err.badalias      = Malformed alias: %S"
 msg.err.no.ctcp.cmd   = %S is not a valid CTCP function for this client
 msg.err.no.ctcp.help  = %S does not have any help information
-msg.err.unknown.host  = The host application URL "%S" is not recognised. Please report what application you are running ChatZilla in, and the URL given.
+msg.err.unknown.host  = The host application UID "%S" is not recognised. Please report what application you are running ChatZilla in, and the UID given.
 msg.err.unable.to.print = The current view does not support printing.
 msg.err.unsupported.command = The server does not support the ``%S'' command.
 msg.err.invalid.mode  = The mode string you entered (``%S'') is invalid. A valid mode string consists of one or more sequences of a + or - followed by one or more alphabetical characters.