diff --git a/drivers/firefox/content/xul/preferences.xul b/drivers/firefox/content/xul/preferences.xul
index 3b9b75993..02a1ecd7d 100755
--- a/drivers/firefox/content/xul/preferences.xul
+++ b/drivers/firefox/content/xul/preferences.xul
@@ -35,6 +35,7 @@
 			<preference id="wappalyzer-cat25" name="extensions.wappalyzer.cat25" type="bool"/>
 			<preference id="wappalyzer-cat26" name="extensions.wappalyzer.cat26" type="bool"/>
 			<preference id="wappalyzer-cat27" name="extensions.wappalyzer.cat27" type="bool"/>
+			<preference id="wappalyzer-cat28" name="extensions.wappalyzer.cat28" type="bool"/>
 
 			<preference id="wappalyzer-tracking" name="extensions.wappalyzer.tracking" type="bool"/>
 		</preferences>
@@ -153,6 +154,11 @@
 										<checkbox preference="wappalyzer-cat27" id="wappalyzer-option-cat27" label="&wappalyzer.cat27;"/>
 									</hbox>
 								</row>
+								<row>
+									<hbox align="center">
+										<checkbox preference="wappalyzer-cat28" id="wappalyzer-option-cat28" label="&wappalyzer.cat28;"/>
+									</hbox>
+								</row>
 							</rows>
 						</grid>
 					</groupbox>
diff --git a/drivers/firefox/defaults/preferences/defaults.js b/drivers/firefox/defaults/preferences/defaults.js
index 1982b0b52..a10e3d5f1 100644
--- a/drivers/firefox/defaults/preferences/defaults.js
+++ b/drivers/firefox/defaults/preferences/defaults.js
@@ -31,3 +31,4 @@ pref('extensions.wappalyzer.cat24',     true);
 pref('extensions.wappalyzer.cat25',     true);
 pref('extensions.wappalyzer.cat26',     true);
 pref('extensions.wappalyzer.cat27',     true);
+pref('extensions.wappalyzer.cat28',     true);
diff --git a/drivers/firefox/locale/en-US/wappalyzer.dtd b/drivers/firefox/locale/en-US/wappalyzer.dtd
index 7aa3a0b18..7d25c760f 100755
--- a/drivers/firefox/locale/en-US/wappalyzer.dtd
+++ b/drivers/firefox/locale/en-US/wappalyzer.dtd
@@ -39,3 +39,6 @@
 <!ENTITY wappalyzer.cat23       "Cache tools">
 <!ENTITY wappalyzer.cat24       "Rich text editors">
 <!ENTITY wappalyzer.cat25       "Javascript Graphics">
+<!ENTITY wappalyzer.cat26       "Mobile Frameworks">
+<!ENTITY wappalyzer.cat27       "Programming Languages">
+<!ENTITY wappalyzer.cat28       "Operating Systems">
diff --git a/share/images/icons/Debian.ico b/share/images/icons/Debian.ico
new file mode 100644
index 000000000..8f4e75cef
Binary files /dev/null and b/share/images/icons/Debian.ico differ
diff --git a/share/images/icons/Mongrel.ico b/share/images/icons/Mongrel.ico
index 36829b9a5..c48862b55 100644
Binary files a/share/images/icons/Mongrel.ico and b/share/images/icons/Mongrel.ico differ
diff --git a/share/images/icons/Ubuntu.ico b/share/images/icons/Ubuntu.ico
new file mode 100644
index 000000000..136b44322
Binary files /dev/null and b/share/images/icons/Ubuntu.ico differ
diff --git a/share/js/apps.js b/share/js/apps.js
index 075378aa5..8f1dce115 100644
--- a/share/js/apps.js
+++ b/share/js/apps.js
@@ -30,7 +30,8 @@
 		24: { name: 'Rich Text Editor',     plural: 'Rich Text Editors' },
 		25: { name: 'Javascript Graphics',  plural: 'Javascript Graphics' },
 		26: { name: 'Mobile Framework',     plural: 'Mobile Frameworks' },
-		27: { name: 'Programming Language', plural: 'Programming Languages' }
+		27: { name: 'Programming Language', plural: 'Programming Languages' },
+		28: { name: 'Operating System',     plural: 'Operating Systems' }
 	};
 
 	w.apps = {
@@ -80,6 +81,7 @@
 		'd3':                    { cats: { 1: 25 }, script: /d3(\.min)?\.js/, env: /^d3$/ },
 		'Danneo CMS':            { cats: { 1:  1 }, meta: { 'generator': /Danneo/i } },
 		'DataLife Engine':       { cats: { 1:  1 }, meta: { 'generator': /DataLife Engine/i } },
+		'Debian':                { cats: { 1: 28 }, headers: { 'Server': /Debian/i, 'X-Powered-By': /(Debian|dotdeb)/i } },
 		'DHTMLX':                { cats: { 1: 12 }, script: /dhtmlxcommon\.js/ },
 		'DirectAdmin':           { cats: { 1:  9 }, html: /<a[^>]+>DirectAdmin<\/a> Web Control Panel/i },
 		'Disqus':                { cats: { 1: 15 }, script: /disqus_url/, html: /<div[^>]+id=("|')disqus_thread("|')/ },
@@ -172,7 +174,7 @@
 		'osCSS':                 { cats: { 1:  6 }, html: /<body onload=("|')window\.defaultStatus='oscss templates';("|')/i },
 		'PANSITE':               { cats: { 1:  1 }, meta: { 'generator': /PANSITE/i } },
 		'papaya CMS':            { cats: { 1:  1 }, html: /<link[^>]*\/papaya-themes\//i },
-		'PHP':                   { cats: { 1: 27 }, headers: { 'Server': /php/i, 'X-Powered-By': /php/i }, url: /\.php$/ },
+		'PHP':                   { cats: { 1: 27 }, headers: { 'Server': /php/i, 'X-Powered-By': /php/i, 'Set-Cookie': /PHPSESSID/ }, url: /\.php$/ },
 		'PHP-Fusion':            { cats: { 1:  1 }, html: /Powered by <a href=("|')[^>]+php-fusion/i },
 		'PHP-Nuke':              { cats: { 1:  2 }, meta: { 'generator': /PHP-Nuke/i }, html: /<[^>]+Powered by PHP\-Nuke/i },
 		'phpBB':                 { cats: { 1:  2 }, meta: { 'copyright': /phpBB Group/ }, html: /Powered by (<a href=("|')[^>]+)?phpBB/i },
@@ -196,7 +198,7 @@
 		'Redmine':               { cats: { 1: 13 }, meta: { 'description': /Redmine/i }, html: /Powered by <a href=("|')[^>]+Redmine/i },
 		'Reinvigorate':          { cats: { 1: 10 }, html: /reinvigorate\.track\("/ },
 		'RequireJS':             { cats: { 1: 12 }, script: /require.*\.js/ , env: /^requirejs$/},
-		'Ruby':                  { cats: { 1: 27 }, headers: { 'Server': /(Mongrel|WEBrick|Ruby)/ } },
+		'Ruby':                  { cats: { 1: 27 }, headers: { 'Server': /(Mongrel|WEBrick|Ruby|mod_rails|mod_rack|Phusion Passenger)/i, 'X-Powered-By': /(mod_rails|mod_rack|Phusion Passenger)/i } },
 		'S.Builder':             { cats: { 1:  1 }, meta: { 'generator': /S\.Builder/i } },
 		's9y':                   { cats: { 1:  1 }, meta: { 'generator': /Serendipity/i } },
 		'script.aculo.us':       { cats: { 1: 12 }, script: /(scriptaculous|protoaculous)\.js/, env: /^Scriptaculous$/ },
@@ -230,6 +232,7 @@
 		'TypePad':               { cats: { 1: 11 }, meta: { 'generator': /typepad/i }, url: /^(www.)?.+\.typepad\.com/i },
 		'TYPO3':                 { cats: { 1:  1 }, meta: { 'generator': /TYPO3/i }, html: /(<(script[^>]* src|link[^>]* href)=[^>]*fileadmin|<!--TYPO3SEARCH)/i, url: /\/typo3/i },
 		'Ubercart':              { cats: { 1:  6 }, script: /uc_cart\/uc_cart_block\.js/ },
+		'Ubuntu':                { cats: { 1: 28 }, headers: { 'Server': /Ubuntu/i, 'X-Powered-By': /Ubuntu/i } },
 		'Umbraco':               { cats: { 1:  1 }, meta: { 'generator': /umbraco/i }, headers: { 'X-Umbraco-Version': /.+/ }, html: /powered by <a href=[^>]+umbraco/i },
 		'Underscore.js':         { cats: { 1: 12 }, script: /underscore.*\.js/ },
 		'UserRules':             { cats: { 1: 13 }, html: /var _usrp =/ , env: /^\_usrp$/ },