diff --git a/extensions/irc/js/lib/irc.js b/extensions/irc/js/lib/irc.js
index e061ef22ae5a..a26eae4361a7 100644
--- a/extensions/irc/js/lib/irc.js
+++ b/extensions/irc/js/lib/irc.js
@@ -2371,6 +2371,14 @@ function serv_cver (e)
     return true;
 }
 
+CIRCServer.prototype.onCTCPSource =
+function serv_csrc (e)
+{
+    e.user.ctcp("SOURCE", this.SOURCE_RPLY, "NOTICE");
+
+    return true;
+}
+
 CIRCServer.prototype.onCTCPOs =
 function serv_os(e)
 {
diff --git a/extensions/irc/xul/content/handlers.js b/extensions/irc/xul/content/handlers.js
index 0252443bb01b..38b6372d3f91 100644
--- a/extensions/irc/xul/content/handlers.js
+++ b/extensions/irc/xul/content/handlers.js
@@ -731,6 +731,12 @@ function serv_ccinfohelp()
     return MSG_CTCPHELP_VERSION;
 }
 
+CIRCServer.prototype.CTCPHelpSource =
+function serv_csrchelp()
+{
+    return MSG_CTCPHELP_SOURCE;
+}
+
 CIRCServer.prototype.CTCPHelpOs =
 function serv_oshelp()
 {
diff --git a/extensions/irc/xul/content/static.js b/extensions/irc/xul/content/static.js
index 562f1c7fc6a6..cf5d32dd6104 100644
--- a/extensions/irc/xul/content/static.js
+++ b/extensions/irc/xul/content/static.js
@@ -289,6 +289,8 @@ function initStatic()
 
     CIRCServer.prototype.VERSION_RPLY = client.userAgent;
 
+    CIRCServer.prototype.SOURCE_RPLY = MSG_SOURCE_REPLY;
+
     client.statusBar = new Object();
 
     client.statusBar["server-nick"] = document.getElementById ("server-nick");
diff --git a/extensions/irc/xul/locale/en-US/chatzilla.properties b/extensions/irc/xul/locale/en-US/chatzilla.properties
index b0462af901ad..5d07a8e5c608 100644
--- a/extensions/irc/xul/locale/en-US/chatzilla.properties
+++ b/extensions/irc/xul/locale/en-US/chatzilla.properties
@@ -737,6 +737,7 @@ msg.cmdmatch          = Commands matching ``%1$S'' are [%2$S].
 msg.default.alias.help = This command is an alias for |%1$S|.
 msg.extra.params      = Extra parameters ``%1$S'' ignored.
 msg.version.reply     = Chatzilla %S [%S]
+msg.source.reply      = http://hacksrus.com/~ginda/chatzilla/
 msg.nothing.to.cancel = No connection in progress, nothing to cancel.
 msg.cancelling        = Cancelling connection to ``%S''...
 msg.current.charset      = Using ``%S'' as default character encoding.
@@ -834,6 +835,7 @@ msg.ctcphelp.clientinfo = CLIENTINFO gives information on available CTCP command
 msg.ctcphelp.action     = ACTION performs an action at the user
 msg.ctcphelp.time       = TIME gives the local date and time for the client
 msg.ctcphelp.version    = VERSION returns the client's version
+msg.ctcphelp.source     = SOURCE returns an address where you can obtain the client
 msg.ctcphelp.os         = OS returns the client's host's operating system and version
 msg.ctcphelp.host       = HOST returns the client's host application name and version
 msg.ctcphelp.ping       = PING echos the parameter passed to the client