diff --git a/js/lib/chatzilla-service.js b/js/lib/chatzilla-service.js
--- a/js/lib/chatzilla-service.js
+++ b/js/lib/chatzilla-service.js
@@ -48,17 +48,16 @@ const RDFS_CONTRACTID =
 //XXXgijs: Because necko is annoying and doesn't expose this error flag, we
 //         define our own constant for it. Throwing something else will show
 //         ugly errors instead of seeminly doing nothing.
 const NS_ERROR_MODULE_NETWORK_BASE = 0x804b0000;
 const NS_ERROR_NO_CONTENT = NS_ERROR_MODULE_NETWORK_BASE + 17;
 
 /* interfaces used in this file */
 const nsIWindowMediator  = Components.interfaces.nsIWindowMediator;
-const nsICmdLineHandler  = Components.interfaces.nsICmdLineHandler;
 const nsICategoryManager = Components.interfaces.nsICategoryManager;
 const nsIURIContentListener = Components.interfaces.nsIURIContentListener;
 const nsIURILoader       = Components.interfaces.nsIURILoader;
 const nsIProtocolHandler = Components.interfaces.nsIProtocolHandler;
 const nsIURI             = Components.interfaces.nsIURI;
 const nsIStandardURL     = Components.interfaces.nsIStandardURL;
 const nsIChannel         = Components.interfaces.nsIChannel;
 const nsIRequest         = Components.interfaces.nsIRequest;
@@ -151,34 +150,22 @@ function CLineService()
 
 /* nsISupports */
 CLineService.prototype.QueryInterface =
 function handler_QI(iid)
 {
     if (iid.equals(nsISupports))
         return this;
 
-    if (nsICmdLineHandler && iid.equals(nsICmdLineHandler))
-        return this;
-
     if (nsICommandLineHandler && iid.equals(nsICommandLineHandler))
         return this;
 
     throw Components.results.NS_ERROR_NO_INTERFACE;
 }
 
-/* nsICmdLineHandler */
-CLineService.prototype.commandLineArgument = "-chat";
-CLineService.prototype.prefNameForStartup = "general.startup.chat";
-CLineService.prototype.chromeUrlForTask = "chrome://chatzilla/content";
-CLineService.prototype.helpText = "Start with an IRC chat client";
-CLineService.prototype.handlesArgs = true;
-CLineService.prototype.defaultArgs = "";
-CLineService.prototype.openWindowWithArgs = true;
-
 /* nsICommandLineHandler */
 CLineService.prototype.handle =
 function handler_handle(cmdLine)
 {
     var uri;
     try
     {
         uri = cmdLine.handleFlagWithParam("chat", false);
diff --git a/moz.build b/moz.build
--- a/moz.build
+++ b/moz.build
@@ -15,8 +15,12 @@ USE_EXTENSION_MANIFEST = True
 XPI_NAME = 'chatzilla'
 export('XPI_NAME')
 
 JAR_MANIFESTS += ['jar.mn']
 
 EXTRA_COMPONENTS += [
     'js/lib/chatzilla-service.js',
 ]
+
+FINAL_TARGET_PP_FILES += [
+    'xpi/resources/install.rdf',
+]