diff --git a/src/Changelog b/src/Changelog
index 61cfab588567..67f8bd008ea9 100644
--- a/src/Changelog
+++ b/src/Changelog
@@ -1,48 +1,31 @@
-0.3.0.development.1:
-  * This is our draft "Firesheep" release.  It has numerous anti-firesheep
+0.3.0:
+  * This is our "Firesheep" release.  It has numerous anti-firesheep
     improvements!
   * Allow rulesets to specify that the secure flag should be set on some
     cookies even if the site operator failed to do so
   * Ship rules for:
     - Amazon S3 (AWS)
     - Github
+    - Bit.ly
+    - Dropbox
+    - Evernote
+    - Cisco
   * Extensive improvements (including secure cookies) in the Twitter and
     Facebook rules
   * Support for full Live / Hotmail encryption
   * Rearrange our Channel Replacement code!
     Fixes https://trac.torproject.org/projects/tor/ticket/1684
           https://bugzilla.mozilla.org/show_bug.cgi?id=548102
-    Thanks to Giogio Maone and Boris Zbarsky!
+    Thanks to Giorgio Maone and Boris Zbarsky!
   * Add scrollbars if there are a lot of rules present in the Preferences
     dialog (may still be somewhat buggy...)
-
-0.2.3.development.3:
-  * This release is mostly here to test the update-signing mechanism
   * Optimise GoogleServices.xml and support Google code search
-  * Revert accidental reenablement of the Amazon rule
-
-0.2.3.development.2:
-  * Restore the 0.2.2 wikipedia fix that got lost in the svn -> git transition
-    https://trac.torproject.org/projects/tor/ticket/2080
-  * Ship rules for some sites that were targetted by Firesheep:
-    - Bit.ly
-    - Dropbox
-    - Evernote
-    - Cisco
-    (Enom's domain search is currently broken over HTTPS :( )
-  * Start deploying an update-signing key
   * Patch for future compatiability with Request Policy:
     https://trac.torproject.org/projects/tor/ticket/1574
-  * Move a large library of ~250 not-yet-active rulesets into a pending-rules
-    directory in the xpi, to simplify git merging and to make them available to
-    curious users
-  * Various rulset improvements and fixes
-
-0.2.3.development.1:
   * Support for the Firefox 4 API
   * The Amazon rule was causing a lot of glitches; it is now off by default
   * Control log verbosity with an about:config variable
-  * Numerous minor rule adjustments
+  * Numerous minor rule improvements
 
 0.2.2:
   * Fix a glitch in the Content Policy path that may or may not have been
diff --git a/src/chrome/content/rules/Dropbox.xml b/src/chrome/content/rules/Dropbox.xml
index 712ad26f1224..3a63409a56e1 100644
--- a/src/chrome/content/rules/Dropbox.xml
+++ b/src/chrome/content/rules/Dropbox.xml
@@ -2,7 +2,7 @@
   <target host="www.dropbox.com" />
   <target host="dropbox.com" />
 
-  <securecookie host="^(.*\.)?dropbox.com$" name=".*" />
+  <securecookie host="^(.*\.)?dropbox\.com$" name=".*" />
 
   <rule from="^http://(www\.)?dropbox\.com/" to="https://www.dropbox.com/"/>
   <!-- This breaks blog.dropbox.com and forums.dropbox.com, for example
diff --git a/src/chrome/content/rules/Evernote.xml b/src/chrome/content/rules/Evernote.xml
index 8ff0370bb44d..5e6421113dc6 100644
--- a/src/chrome/content/rules/Evernote.xml
+++ b/src/chrome/content/rules/Evernote.xml
@@ -2,7 +2,7 @@
   <target host="www.evernote.com" />
   <target host="evernote.com" />
 
-  <securecookie host="^(.*\.)?evernote.com$" name=".*" />
+  <securecookie host="^(.*\.)?evernote\.com$" name=".*" />
 
   <rule from="^http://(www\.)?evernote\.com/" to="https://www.evernote.com/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/FB-extra.xml b/src/chrome/content/rules/FB-extra.xml
new file mode 100644
index 000000000000..2347606a3cb3
--- /dev/null
+++ b/src/chrome/content/rules/FB-extra.xml
@@ -0,0 +1,11 @@
+<ruleset name="Facebook+ (may break apps)" default_off="waiting for full FB cert deployment">
+  <target host="facebook.com" />
+  <target host="*.facebook.com" />
+
+  <securecookie host="^(.*\.)?facebook\.com$" name="c_user" />
+  <securecookie host="^(.*\.)?facebook\.com$" name="lu" />
+  <securecookie host="^(.*\.)?facebook\.com$" name="sct" />
+  <securecookie host="^(.*\.)?facebook\.com$" name="xs" />
+
+  <rule from="^http://([a-z][a-z])-([a-z][a-z])\.facebook\.com/" to="https://www.facebook.com/"/>
+</ruleset>
diff --git a/src/chrome/content/rules/Facebook.xml b/src/chrome/content/rules/Facebook.xml
index 5d06d026a1cb..fb91f9bd4c46 100644
--- a/src/chrome/content/rules/Facebook.xml
+++ b/src/chrome/content/rules/Facebook.xml
@@ -3,14 +3,13 @@
   <target host="*.facebook.com" />
   <target host="*.ak.facebook.com" />
   <target host="www.v6.facebook.com" />
+
   <target host="de-de.facebook.de" />
   <target host="www.facebook.de" />
   <target host="facebook.de" />
-
-  <securecookie host="^(.*\.)?facebook\.com$" name="c_user" />
-  <securecookie host="^(.*\.)?facebook\.com$" name="lu" />
-  <securecookie host="^(.*\.)?facebook\.com$" name="sct" />
-  <securecookie host="^(.*\.)?facebook\.com$" name="xs" />
+  <target host="fr-fr.facebook.fr" />
+  <target host="www.facebook.fr" />
+  <target host="facebook.fr" />
 
   <rule from="^http://(www\.)?facebook\.com/" to="https://www.facebook.com/"/>
   <rule from="^http://m\.facebook\.com/"      to="https://m.facebook.com/"/>
@@ -22,8 +21,16 @@
   <rule from="^http://s-static\.ak\.facebook\.com/" 
           to="https://s-static.ak.facebook.com/" />
 
+  <rule from="^http://badge\.facebook\.com/badge/"
+          to="https://www.facebook.com/badge/"/>
+
   <rule from="^https?://(de-de|www\.)?facebook\.de/" 
           to="https://www.facebook.com/"/>
   <rule from="^https?://de-de\.facebook\.com/" 
           to="https://www.facebook.com/"/>
+
+  <rule from="^https?://(fr-fr|www\.)?facebook\.fr/" 
+          to="https://www.facebook.com/"/>
+  <rule from="^https?://fr-fr\.facebook\.com/" 
+          to="https://www.facebook.com/"/>
 </ruleset>
diff --git a/src/chrome/content/rules/Github.xml b/src/chrome/content/rules/Github.xml
index a6cc6508f38d..cd0bd69c8765 100644
--- a/src/chrome/content/rules/Github.xml
+++ b/src/chrome/content/rules/Github.xml
@@ -2,7 +2,7 @@
   <target host="*.github.com" />
   <target host="github.com" />
 
-  <securecookie host="^(.*\.)?github.com$" name=".*" />
+  <securecookie host="^(.*\.)?github\.com$" name=".*" />
 
   <rule from="^http://(www\.)?github\.com/" to="https://github.com/"/>
   <rule from="^http://(assets\d+|gist)\.github\.com/" to="https://$1.github.com/"/>
diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 6c6fde378666..a3116762bd9d 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -1,17 +1,12 @@
 <!-- XXX: Needs more testing -->
 <ruleset name="GoogleServices" match_rule="http:.*google">
   <target host="spreadsheets.google.com" />
-  <target host="docs.google.com" />
-  <target host="groups.google.com" />
+  <target host="*.google.com" />
   <target host="groups.google.de" />
   <target host="mail.google.com" />
-  <target host="www.google.com" />
   <target host="google.com" />
   <target host="www.gmail.com" />
   <target host="gmail.com" />
-  <target host="code.google.com" />
-  <target host="sites.google.com" />
-  <target host="news.google.com" />
   <target host="www.googlecode.com" />
   <target host="googlecode.com" />
   <target host="www.google.co.*" />
@@ -49,7 +44,7 @@
           to="https://www.google$2/profiles" />
 
   <rule from="^http://news\.google((\.com?)?(\.[^/@:][^/@:])?)/"
-          to="https://news.google$1/" />
+          to="https://www.google.com/news" />
 
   <rule from="^http://www\.googlecode\.com/$"
           to="https://code.google.com/" />
@@ -58,6 +53,20 @@
   <rule from="^http://([^/:@]*)\.googlecode\.com/(.+)"
           to="https://$1.googlecode.com/$2" />
 
+  <rule from="^http://trends\.google\.com/"
+          to="https://www.google.com/trends"/>
+  <rule from="^http://(www\.)?google\.com/trends" 
+          to="https://www.google.com/trends"/>
+
   <rule from="^http://www\.google\.com/cse/intl/([^/:@][^/:@])/images/google_custom_search_watermark\.gif$" to="https://www.google.com/cse/intl/$1/images/google_custom_search_watermark.gif" />
 
+  <rule from="^http://(www\.)?google\.com/finance" 
+          to="https://www.google.com/finance"/>
+  <rule from="^http://(www\.)?google\.co\.uk/finance" 
+          to="https://www.google.co.uk/finance"/>
+  <rule from="^https?://finance\.google\.com/" 
+          to="https://www.google.com/finance/"/>
+  <rule from="^https?://finance\.google\.co\.uk/" 
+          to="https://www.google.co.uk/finance/"/>
+
 </ruleset>
diff --git a/src/install.rdf b/src/install.rdf
index 7157b156f028..86adf7118b32 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -7,11 +7,11 @@
         <em:creator>Mike Perry &amp; Peter Eckersley</em:creator>
         <em:id>https-everywhere@eff.org</em:id>
         <em:description>Encrypt the Web! Automatically use HTTPS security on many sites.</em:description>
-        <em:version>0.3.0.development.1</em:version>
+        <em:version>0.3.0</em:version>
         <em:homepageURL>https://www.eff.org/https-everywhere</em:homepageURL>
         <em:optionsURL>chrome://https-everywhere/content/preferences.xul</em:optionsURL>
         <em:iconURL>chrome://https-everywhere/skin/https-everywhere.png</em:iconURL>
-        <em:updateURL>https://www.eff.org/files/https-everywhere-devel-update.rdf</em:updateURL>
+        <em:updateURL>https://www.eff.org/files/https-everywhere-update.rdf</em:updateURL>
 		<em:unpack>true</em:unpack> <!-- Required for Firefox 4 -->
         <!-- <em:updateKey>MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSry2bbc4waMQHAqFZ7dR53eJUXR8EMAW/TxMqT2Tnx1Zd16nh7RCv2/lVWpSD706SmZC39mUpJPkc53XEZtdRelWIh0+oBK5kjhDx+C+N6IzWPScbL+NdIymNpA4yIHMYkfX5XJgJ67l6JkFzqoWPorcw8dhxUeRASMwEM6B1EQIDAQAB</em:updateKey> -->
         <!-- firefox -->