diff --git a/mozilla/browser/base/Makefile.in b/mozilla/browser/base/Makefile.in
index 0d34502a8cb..c0057c6159f 100644
--- a/mozilla/browser/base/Makefile.in
+++ b/mozilla/browser/base/Makefile.in
@@ -56,7 +56,7 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES += \
 	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
-	-DAPP_EULA_BLOCK=$(abs_srcdir)/content/overrides/app-license.html \
+	-DAPP_LICENSE_BLOCK=$(abs_srcdir)/content/overrides/app-license.html \
 	$(NULL)
 
 ifndef MOZ_BRANDING_DIRECTORY
diff --git a/mozilla/browser/base/content/overrides/app-license.html b/mozilla/browser/base/content/overrides/app-license.html
index 0a66b44cd28..16befbc7234 100644
--- a/mozilla/browser/base/content/overrides/app-license.html
+++ b/mozilla/browser/base/content/overrides/app-license.html
@@ -1,5 +1,3 @@
-    <p>Official <b>binaries</b> of this product released by the 
-    <a href="http://www.mozilla.com/">Mozilla Corporation</a> 
-    are made available under 
-    <a href="http://www.mozilla.org/foundation/EULA/">the corresponding 
-    EULA</a>.</p>
+    <p><b>Binaries</b> of this product have been made available to you by the
+    <a href="http://www.mozilla.org/">Mozilla Project</a> under the Mozilla
+    Public License. <a href="about:rights">Know your rights</a>.</p>
diff --git a/mozilla/mail/app/Makefile.in b/mozilla/mail/app/Makefile.in
index e87f29df405..c35381de390 100644
--- a/mozilla/mail/app/Makefile.in
+++ b/mozilla/mail/app/Makefile.in
@@ -57,7 +57,7 @@ DEFINES += \
   -DAB_CD=$(AB_CD) \
   -DGRE_MILESTONE=$(GRE_MILESTONE) \
   -DGRE_BUILDID=$(GRE_BUILDID) \
-  -DAPP_EULA_BLOCK=$(MAIL_APP_LICENSE_FILE) \
+  -DAPP_LICENSE_BLOCK=$(MAIL_APP_LICENSE_FILE) \
    $(NULL)
 
 DIRS		= profile
diff --git a/mozilla/toolkit/content/license.html b/mozilla/toolkit/content/license.html
index 6cfefdd05f7..5823817385d 100644
--- a/mozilla/toolkit/content/license.html
+++ b/mozilla/toolkit/content/license.html
@@ -121,14 +121,12 @@
 
     <div class="correctme">
 
-#ifdef APP_EULA_BLOCK
-#includesubst @APP_EULA_BLOCK@
+#ifdef APP_LICENSE_BLOCK
+#includesubst @APP_LICENSE_BLOCK@
 #endif
     
-    <p>Except as described
-       <a id="exceptions-link" href="about:license#exceptions">here</a>, all 
-       of the <b>source code</b> to this product is 
-       <a href="http://developer.mozilla.org/en/docs/Mozilla_Source_Code_Via_CVS">available</a> 
+    <p>All of the <b>source code</b> to this product is 
+       <a href="https://developer.mozilla.org/en/Mozilla_Source_Code_%28CVS%29">available</a> 
        under licenses which are both 
        <a href="http://www.gnu.org/philosophy/free-sw.html">free</a> and 
        <a href="http://www.opensource.org/docs/definition.php">open source</a>.
@@ -2631,24 +2629,6 @@ POSSIBILITY OF SUCH DAMAGE.
     
     <hr>
     
-    <h3><a name="exceptions"></a>* Exceptions</h3>
-    
-    <p class="correctme">
-    Depending on how it was compiled, your product distribution and version 
-    may include the following portions which are not available under the 
-    above terms:
-    </p>
-    
-    <ul>
-      <li>Image files containing the 
-          <a href="http://www.mozilla.org/foundation/trademarks/policy.html">trademarks 
-          and logos</a> of the Mozilla
-          Foundation, which may not be reproduced without permission. 
-          (Copyright &copy;2004-2009 The Mozilla Foundation. 
-          All Rights Reserved. Some trademark rights are used under 
-          license from The Charlton Company.)
-    </ul>  
-    
     <p class="correctme"><a href="about:license#top">Return to top</a>.</p>
     
   </body>