diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..c16d00737
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+wappalyzer-chrome.zip
+wappalyzer-firefox.xpi
diff --git a/drivers/chrome/.gitignore b/drivers/chrome/.gitignore
deleted file mode 100644
index a21be109e..000000000
--- a/drivers/chrome/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-chrome.zip
diff --git a/drivers/chrome/js/driver.js b/drivers/chrome/js/driver.js
index 2c67b5c41..f920af324 100644
--- a/drivers/chrome/js/driver.js
+++ b/drivers/chrome/js/driver.js
@@ -96,7 +96,7 @@
 		},
 
 		goToURL: function(args) {
-			window.open(args.url + '?utm_source=firefox&utm_medium=extension&utm_campaign=extensions');
+			window.open(args.url + '?utm_source=chrome&utm_medium=extension&utm_campaign=extensions');
 		},
 
 		/**
diff --git a/drivers/chrome/js/options.js b/drivers/chrome/js/options.js
index afb6438be..6a9456dde 100644
--- a/drivers/chrome/js/options.js
+++ b/drivers/chrome/js/options.js
@@ -7,7 +7,7 @@ $(function() {
 
 			$('#github'    ).click(function() { window.open(wappalyzer.config.githubURL);  });
 			$('#twitter'   ).click(function() { window.open(wappalyzer.config.twitterURL); });
-			$('#wappalyzer').click(function() { window.open(wappalyzer.config.websiteURL); });
+			$('#wappalyzer').click(function() { window.open(wappalyzer.config.websiteURL + '?utm_source=chrome&utm_medium=extension&utm_campaign=extensions'); });
 
 			$('#options-save').click(options.save);
 		},
diff --git a/drivers/chrome/js/popup.js b/drivers/chrome/js/popup.js
index b7ee91f3c..1c71449fc 100644
--- a/drivers/chrome/js/popup.js
+++ b/drivers/chrome/js/popup.js
@@ -53,14 +53,14 @@ var wappalyzer = {};
 						response.tabCache.appsDetected.map(function(appName) {
 							html =
 								'<div class="detected-app">' +
-									'<a target="_blank" href="http://wappalyzer.com/applications/' + appName.toLowerCase().replace(/ /g, '-').replace(/[^\w-]/g, '') + '">' +
+									'<a target="_blank" href="http://wappalyzer.com/applications/' + appName.toLowerCase().replace(/ /g, '-').replace(/[^\w-]/g, '') + '?utm_source=chrome&utm_medium=extension&utm_campaign=extensions">' +
 										'<img src="images/icons/' + appName + '.png"/>' +
 										'<span class="label">' + appName + '</span>' +
 									'</a>';
 
 							wappalyzer.apps[appName].cats.map(function(cat) {
 								html +=
-									'<a target="_blank" href="http://wappalyzer.com/categories/' + wappalyzer.categories[cat] + '">' +
+									'<a target="_blank" href="http://wappalyzer.com/categories/' + wappalyzer.categories[cat] + '?utm_source=chrome&utm_medium=extension&utm_campaign=extensions">' +
 										'<span class="category">' + chrome.i18n.getMessage('categoryName' + cat) + '</span>' +
 									'</a>';
 							});
diff --git a/drivers/chrome/manifest.json b/drivers/chrome/manifest.json
index f27f6bab1..0937017fb 100644
--- a/drivers/chrome/manifest.json
+++ b/drivers/chrome/manifest.json
@@ -1,7 +1,7 @@
 { "name": "Wappalyzer",
-	"homepage_url": "http://wappalyzer.com",
+	"homepage_url": "http://wappalyzer.com?utm_source=chrome&utm_medium=extension&utm_campaign=extensions",
 	"description": "Identifies software on the web",
-	"version": "2.6",
+	"version": "2.9",
 	"default_locale": "en",
 	"manifest_version": 2,
 	"icons": {
diff --git a/drivers/firefox/.gitignore b/drivers/firefox/.gitignore
deleted file mode 100644
index 3a203c535..000000000
--- a/drivers/firefox/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-wappalyzer.xpi
diff --git a/drivers/firefox/content/xul/preferences.xul b/drivers/firefox/content/xul/preferences.xul
index e1d3aee1c..1259ddcaf 100755
--- a/drivers/firefox/content/xul/preferences.xul
+++ b/drivers/firefox/content/xul/preferences.xul
@@ -5,7 +5,7 @@
 
 <!DOCTYPE overlay SYSTEM "chrome://wappalyzer/locale/wappalyzer.dtd">
 
-<prefwindow id="wappalyzer-options" title="&wappalyzer.name; - &wappalyzer.categories;" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
+<prefwindow id="wappalyzer-options" title="&wappalyzer.name; - &wappalyzer.preferences;" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 	<prefpane>
 		<preferences>
 			<preference id="wappalyzer-icons"    name="extensions.wappalyzer.showIcons" type="bool"/>
diff --git a/package.sh b/package.sh
new file mode 100755
index 000000000..70ba7c714
--- /dev/null
+++ b/package.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+path=`pwd`
+
+./links.sh
+
+cd $path/drivers/chrome  && zip -ro $path/wappalyzer-chrome.zip  .
+cd $path/drivers/firefox && zip -ro $path/wappalyzer-firefox.xpi .