diff -Nru ubufox-1.0.3/components/aboutStartpage.js ubufox-1.0.4/components/aboutStartpage.js
--- ubufox-1.0.3/components/aboutStartpage.js	2012-03-02 22:25:54.000000000 +0000
+++ ubufox-1.0.4/components/aboutStartpage.js	2012-04-23 23:27:55.000000000 +0000
@@ -45,6 +45,7 @@
 var HOMEPAGE_OFFLINE_TMPL = "/usr/share/ubuntu-artwork/home/locales/index-"
 
 var HOMEPAGE_ONLINE_PREFIX = "http://start.ubuntu.com/";
+var HOMEPAGE_ONLINE_GOOGLE_QUERY = "sourceid=hp";
 
 function getIsOffline() {
   var ios = Cc["@mozilla.org/network/io-service;1"]
@@ -93,11 +94,17 @@
    return preferredHomepage;
 }
 
-function getCurrentSearchEngineName () {
-  var searchService = Cc["@mozilla.org/browser/search-service;1"]
-                      .getService (Ci.nsIBrowserSearchService);
-  var defaultEngine = searchService.currentEngine;
-  return defaultEngine.name;
+function getCurrentSearchEngineParams() {
+  try {
+    let searchService =  Cc["@mozilla.org/browser/search-service;1"]
+                            .getService (Ci.nsIBrowserSearchService);
+    if (searchService.currentEngine.searchForm.indexOf("search.yahoo.com")
+        != -1) {
+      return {"name": "Yahoo", "query": null};
+    } else {
+      return {"name": "Google", "query": HOMEPAGE_ONLINE_GOOGLE_QUERY};
+    }
+  } catch(e) { return {"name": "Google", "query": HOMEPAGE_ONLINE_GOOGLE_QUERY}; }
 }
 
 function AboutStartpage() {}
@@ -121,14 +128,17 @@
     var principal = secMan.getCodebasePrincipal(aURI);
 
     if (!getIsOffline()) {
-      let searchEngineName = getCurrentSearchEngineName();
+      let params = getCurrentSearchEngineParams();
       let release = Services.prefs.getCharPref("extensions.ubufox@ubuntu.com.release");
       var uri;
       // allow defaults packages to overwrite the homepage
       try {
         uri = Services.prefs.getCharPref("extensions.ubufox@ubuntu.com.custom_homepage");
       } catch(e) {
-        uri = HOMEPAGE_ONLINE_PREFIX + release + "/" + searchEngineName + "/";
+        uri = HOMEPAGE_ONLINE_PREFIX + release + "/" + params.name + "/";
+        if (params.query != null) {
+          uri += "?" + params.query;
+        }
       }
       let channel = ios.newChannel(uri, null, null);
       channel.originalURI = aURI;
diff -Nru ubufox-1.0.3/debian/changelog ubufox-1.0.4/debian/changelog
--- ubufox-1.0.3/debian/changelog	2012-03-12 15:53:18.000000000 +0000
+++ ubufox-1.0.4/debian/changelog	2012-04-23 23:47:18.000000000 +0000
@@ -1,3 +1,11 @@
+ubufox (1.0.4-0ubuntu1) oneiric-security; urgency=low
+
+  * New upstream release
+    - Update compatibility for Firefox 13 (LP: #987262)
+    - Update startpage URL (LP: #985862)
+
+ -- Chris Coulson <chris.coulson@canonical.com>  Tue, 24 Apr 2012 00:44:08 +0100
+
 ubufox (1.0.3-0ubuntu1) oneiric-security; urgency=low
 
   * New upstream release
diff -Nru ubufox-1.0.3/install.rdf ubufox-1.0.4/install.rdf
--- ubufox-1.0.3/install.rdf	2012-03-02 22:25:54.000000000 +0000
+++ ubufox-1.0.4/install.rdf	2012-04-23 23:32:58.000000000 +0000
@@ -5,7 +5,7 @@
     <em:id>ubufox@ubuntu.com</em:id>
     <em:unpack>true</em:unpack>
     <em:name>Ubuntu Firefox Modifications</em:name>
-    <em:version>1.0.3</em:version>
+    <em:version>1.0.4</em:version>
     <em:creator>Canonical Ltd.</em:creator>
     <em:contributor>Alexander Sack &lt;asac@ubuntu.com&gt;</em:contributor>
     <em:contributor>Sasa Bodiroza &lt;jazzva@gmail.com&gt;</em:contributor>
@@ -18,7 +18,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- firefox -->
         <em:minVersion>4.0b6</em:minVersion>
-        <em:maxVersion>11.*</em:maxVersion>
+        <em:maxVersion>13.*</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>