diff --git a/lib/config.tmpl b/lib/config.tmpl
index f9287cd059b21e79062048837c3cc578b231b74f_bGliL2NvbmZpZy50bXBs..04f5c41a9697b2207668f9e4511f27f867ac2cd1_bGliL2NvbmZpZy50bXBs 100644
--- a/lib/config.tmpl
+++ b/lib/config.tmpl
@@ -24,6 +24,6 @@
 [% download_linux_mb = 13 %]
 [% download_mac_mb = 22 %]
 
-[% betaversion = '2.1b2' %]
-[% betaname = "SeaMonkey 2.1 Beta 2" %]
+[% betaversion = '2.1b3' %]
+[% betaname = "SeaMonkey 2.1 Beta 3" %]
 
@@ -29,3 +29,3 @@
 
-[% develversion = '2.1b3pre' %]
+[% develversion = '2.1pre' %]
 [% develdownloadbase = 'http://ftp.mozilla.org/pub/mozilla.org/seamonkey/nightly/latest-comm-central-trunk' %]
diff --git a/lib/sitemap.xml b/lib/sitemap.xml
index f9287cd059b21e79062048837c3cc578b231b74f_bGliL3NpdGVtYXAueG1s..04f5c41a9697b2207668f9e4511f27f867ac2cd1_bGliL3NpdGVtYXAueG1s 100644
--- a/lib/sitemap.xml
+++ b/lib/sitemap.xml
@@ -13,6 +13,11 @@
   <page url="news" title="News" id="news" />
 
   <page url="releases/" title="Download &amp;amp; Releases" id="releases">
+    <page url="releases/2.1b3" title="2.1 Beta 3" id="2.1b3" hide="true">
+      <page url="releases/seamonkey2.1b3/" title="Release Notes" id="seamonkey2.1b3">
+        <page url="releases/seamonkey2.1b3/changes" title="What's New" id="seamonkey2.1b3-changes" />
+      </page>
+    </page>
     <page url="releases/2.1b2" title="2.1 Beta 2" id="2.1b2" hide="true">
       <page url="releases/seamonkey2.1b2/" title="Release Notes" id="seamonkey2.1b2">
         <page url="releases/seamonkey2.1b2/changes" title="What's New" id="seamonkey2.1b2-changes" />
diff --git a/src/download.jst b/src/download.jst
index f9287cd059b21e79062048837c3cc578b231b74f_c3JjL2Rvd25sb2FkLmpzdA==..04f5c41a9697b2207668f9e4511f27f867ac2cd1_c3JjL2Rvd25sb2FkLmpzdA== 100644
--- a/src/download.jst
+++ b/src/download.jst
@@ -40,6 +40,6 @@
   "el":  { "-":  { version: null,      betaversion: null,     name: "Greek",                    localName: "\u0395\u03BB\u03BB\u03B7\u03BD\u03B9\u03BA\u03AE" } },
   "en":  { "us": { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "English",                  localName: "English" },
            "gb": { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "English (British)",        localName: "English (British)" } },
-  "es":  { "ar": { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Spanish (Latin American)", localName: "Espa\u00F1ol (de Am\u00E9rica)" },
+  "es":  { "ar": { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Spanish (Latin American)", localName: "Espa\u00F1ol (de Am\u00E9rica)" },
            "es": { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Spanish (Spain)",          localName: "Espa\u00F1ol (de Espa\u00F1a)" } },
   "eu":  { "-":  { version: null,      betaversion: null,     name: "Basque",                   localName: "Euskara" } },
@@ -44,6 +44,6 @@
            "es": { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Spanish (Spain)",          localName: "Espa\u00F1ol (de Espa\u00F1a)" } },
   "eu":  { "-":  { version: null,      betaversion: null,     name: "Basque",                   localName: "Euskara" } },
-  "fi":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Finnish",                  localName: "Suomi" } },
+  "fi":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Finnish",                  localName: "Suomi" } },
   "fr":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "French",                   localName: "Fran\u00e7ais" } },
   "fy":  { "nl": { version: null,      betaversion: null,     name: "Frisian",                  localName: "Frysk" } },
   "ga":  { "ie": { version: null,      betaversion: null,     name: "Irish",                    localName: "Gaeilge" } },
@@ -52,10 +52,10 @@
   "he":  { "-":  { version: null,      betaversion: null,     name: "Hebrew",                   localName: "\u05E2\u05D1\u05E8\u05D9\u05EA" } },
   "hu":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Hungarian",                localName: "Magyar" } },
   "hy":  { "am": { version: null,      betaversion: null,     name: "Armenian",                 localName: "\u0540\u0561\u0575\u0565\u0580\u0565\u0576" } },
-  "it":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Italian",                  localName: "Italiano" } },
+  "it":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Italian",                  localName: "Italiano" } },
   "ja":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Japanese",                 localName: "\u65e5\u672c\u8a9e" } },
   "ka":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Georgian",                 localName: "\u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8" } },
   "ko":  { "-":  { version: null,      betaversion: null,     name: "Korean",                   localName: "\uD55C\uAD6D\uC5B4" } },
   "lt":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Lithuanian",               localName: "Lietuvi\u0173" } },
   "mk":  { "-":  { version: null,      betaversion: null,     name: "Macedonian",               localName: "\u041C\u0430\u043A\u0435\u0434\u043E\u043D\u0441\u043A\u0438" } },
   "mn":  { "-":  { version: null,      betaversion: null,     name: "Mongolian",                localName: "\u041C\u043E\u043D\u0433\u043E\u043B" } },
@@ -56,10 +56,10 @@
   "ja":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Japanese",                 localName: "\u65e5\u672c\u8a9e" } },
   "ka":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Georgian",                 localName: "\u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8" } },
   "ko":  { "-":  { version: null,      betaversion: null,     name: "Korean",                   localName: "\uD55C\uAD6D\uC5B4" } },
   "lt":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Lithuanian",               localName: "Lietuvi\u0173" } },
   "mk":  { "-":  { version: null,      betaversion: null,     name: "Macedonian",               localName: "\u041C\u0430\u043A\u0435\u0434\u043E\u043D\u0441\u043A\u0438" } },
   "mn":  { "-":  { version: null,      betaversion: null,     name: "Mongolian",                localName: "\u041C\u043E\u043D\u0433\u043E\u043B" } },
-  "nb":  { "no": { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Norwegian (Bokm\u00E5l)",  localName: "Norsk bokm\u00E5l" } },
+  "nb":  { "no": { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Norwegian (Bokm\u00E5l)",  localName: "Norsk bokm\u00E5l" } },
   "nn":  { "no": { version: null,      betaversion: null,     name: "Norwegian (Nynorsk)",      localName: "Norsk nynorsk" } },
   "nl":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Dutch",                    localName: "Nederlands" } },
   "pa":  { "in": { version: null,      betaversion: null,     name: "Punjabi",                  localName: "\u0A2A\u0A70\u0A1C\u0A3E\u0A2C\u0A40" } },
@@ -71,8 +71,8 @@
   "sk":  { "-":  { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Slovak",                   localName: "Slovensk\u00FD" } },
   "sl":  { "-":  { version: null,      betaversion: null,     name: "Slovenian",                localName: "Slovensko" } },
   "sq":  { "-":  { version: null,      betaversion: null,     name: "Albanian",                 localName: "Shqipe" } },
-  "sv":  { "se": { version: "[% releaseversion %]",   betaversion: "[% betaversion %]",  name: "Swedish",                  localName: "Svenska" } },
-  "tr":  { "-":  { version: null,      betaversion: "[% releaseversion %]",  name: "Turkish",                  localName: "T\u00FCrk\u00E7e" } },
+  "sv":  { "se": { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Swedish",                  localName: "Svenska" } },
+  "tr":  { "-":  { version: null,      betaversion: "[% betaversion %]",  name: "Turkish",                  localName: "T\u00FCrk\u00E7e" } },
   "zh":  { "cn": { version: "[% releaseversion %]",   betaversion: "[% releaseversion %]",  name: "Chinese (Simplified)",     localName: "\u4E2D\u6587 (\u7B80\u4F53)" },
            "tw": { version: null,      betaversion: null,     name: "Chinese (Traditional)",    localName: "\u6b63\u9ad4\u4e2d\u6587 (\u7E41\u9AD4)" } }
 };
diff --git a/src/news.en.xml b/src/news.en.xml
index f9287cd059b21e79062048837c3cc578b231b74f_c3JjL25ld3MuZW4ueG1s..04f5c41a9697b2207668f9e4511f27f867ac2cd1_c3JjL25ld3MuZW4ueG1s 100644
--- a/src/news.en.xml
+++ b/src/news.en.xml
@@ -7,6 +7,69 @@
 -->
 
 <newsfeed title="SeaMonkey News" url="http://seamonkey-project.org/news">
+  <entry id="2011-04-07" showfront="true">
+    <headline>SeaMonkey 2.1 Beta 3 Introduces New Features</headline>
+    <content type="html" xml:lang="en">
+<![CDATA[<p><a href="http://www.seamonkey-project.org/releases/seamonkey2.1b3/">SeaMonkey
+2.1 Beta 3</a> is available for free download now in 14 languages and makes a huge list of new
+functionality available to a wider testing audience for the first time.
+Please note that this pre-release version is still intended for testers only and might
+still show some problems in everyday use. As always, we appreciate any feedback you may have
+and encourage users to help us by filing bugs.
+</p>
+<p>
+In addition to the changes in the alpha releases, and our first beta release, this version
+features the following <a href="http://www.seamonkey-project.org/releases/seamonkey2.1b3/#new">new
+improvements</a>:
+<ul>
+  <li>When you start SeaMonkey in Safe Mode, you are now presented with a
+    dialog that allows you to permanently apply some of the Safe Mode
+    changes. Furthermore you can enter Safe Mode directly from the Help menu
+    now.</li>
+  <li>If a plugins crashes, you are now presented with several options right
+    there (e.g. reloading the page).</li>
+  <li>Built-in extensions (ChatZilla, JavaScript Debugger, DOM Inspector and
+    DebugQA) are now installed into the profile.</li>
+  <li>SeaMonkey Sync supports the easy setup process (J-PAKE) now.</li>
+  <li>Windows 7 Jump Lists support was added.</li>
+  <li>Outdated plugins are detected now.</li>
+  <li>Tabs can now be switched using mouse scrolling (in addition to
+    scrolling the tab bar).</li>
+  <li>WebGL support via ANGLE has been added.</li>
+  <li>An optional search bar (including suggestions if the search engine
+    supports it) is available in browser toolbar customization, and an
+    engine manager for OpenSearch is available.</li>
+  <li>The delete action in the MailNews Advanced Search dialog has been
+    fixed.</li>
+  <li>Plugins now work in feeds shown in MailNews windows.</li>
+  <li>ChatZilla is working again.</li>
+  <li>The JavaScript Debugger Venkman is working again.</li>
+  <li>Download progress is now shown in the Windows 7 taskbar.</li>
+  <li>Cascaded Session Restore improves restoring large browsing sessions.</li>
+</ul>
+<p>
+We welcome any and all discussions on this beta on our
+<a href="http://www.seamonkey-project.org/community#groups">newsgroups</a>,
+or you can even
+<a href="http://bugzilla.mozilla.org/enter_bug.cgi?format=guided">file a bug</a>
+if you find one. Be sure to check our
+<a href="http://www.seamonkey-project.org/releases/seamonkey2.1b3/#issues">Known Issues</a>
+prior to filing bugs. 
+</p>
+<p>
+SeaMonkey 2.1 Beta 3 is
+<a href="http://www.seamonkey-project.org/releases/2.1b3">available
+for free download</a> on the SeaMonkey website. Once you have downloaded and
+installed this release, we'd like to encourage you to
+<a href="http://www.seamonkey-project.org/dev/get-involved">get involved</a> in
+discussing and reporting problems as well as further improving the product.
+</p>
+<p>
+Thanks for testing and helping us to make SeaMonkey even better!
+</p>]]>
+    </content>
+  </entry>
+
   <entry id="2011-03-23" showfront="true">
     <headline>SeaMonkey 2.0.13 Security Update</headline>
     <content type="html" xml:lang="en">
@@ -61,7 +124,7 @@
     </content>
   </entry>
 
-  <entry id="2011-02-14" showfront="true">
+  <entry id="2011-02-14" showfront="false">
     <headline>SeaMonkey 2.1 Beta 2 Introduces New Features</headline>
     <content type="html" xml:lang="en">
 <![CDATA[<p><a href="http://www.seamonkey-project.org/releases/seamonkey2.1b2/">SeaMonkey
diff --git a/src/releases/2.1b2.en.html b/src/releases/2.1b2.en.html
index f9287cd059b21e79062048837c3cc578b231b74f_c3JjL3JlbGVhc2VzLzIuMWIyLmVuLmh0bWw=..04f5c41a9697b2207668f9e4511f27f867ac2cd1_c3JjL3JlbGVhc2VzLzIuMWIyLmVuLmh0bWw= 100644
--- a/src/releases/2.1b2.en.html
+++ b/src/releases/2.1b2.en.html
@@ -21,10 +21,10 @@
 <p class="release-date">Released February 14, 2011</p>
 
 <div class="important">
-  <strong class="shout">Be careful!</strong> The SeaMonkey version available for
-  download on this page is a testing-only preview of the next generation of our
-  Internet suite. Please test it carefully, it's not yet in a state where we can
-  encourage you to use it for daily browsing and mail operations.
+  <strong class="very-strong shout">Warning!</strong> The SeaMonkey version
+  available for download on this page is an outdated testing-only preview of
+  the next generation of our Internet suite. Please test a
+  <a href="[% betaversion %]">newer preview version</a> instead of this one.
   <br>For daily use, we strongly advise you to download the
   <a href="./">current stable release</a> instead.
 </div>
diff --git a/src/releases/index.en.html b/src/releases/index.en.html
index f9287cd059b21e79062048837c3cc578b231b74f_c3JjL3JlbGVhc2VzL2luZGV4LmVuLmh0bWw=..04f5c41a9697b2207668f9e4511f27f867ac2cd1_c3JjL3JlbGVhc2VzL2luZGV4LmVuLmh0bWw= 100644
--- a/src/releases/index.en.html
+++ b/src/releases/index.en.html
@@ -449,7 +449,7 @@
 </div>
 
 <h2><a name="[% betaversion %]">[% betaname %]</a></h2>
-<p class="release-date">Released February 14, 2011</p>
+<p class="release-date">Released April 7, 2011</p>
 
 <div class="key-point">
 <ul>
@@ -470,6 +470,7 @@
 <div class="para" id="old">
   <p>Previously released versions of SeaMonkey:</p>
   <ul class="snav">
+    <li><a href="2.1b2">2.1 Beta 2</a></li>
     <li><a href="2.1b1">2.1 Beta 1</a></li>
     <li><a href="2.1a3">2.1 Alpha 3</a></li>
     <li><a href="2.1a2">2.1 Alpha 2</a></li>
diff --git a/src/releases/seamonkey2.1b2/index.en.html b/src/releases/seamonkey2.1b2/index.en.html
index f9287cd059b21e79062048837c3cc578b231b74f_c3JjL3JlbGVhc2VzL3NlYW1vbmtleTIuMWIyL2luZGV4LmVuLmh0bWw=..04f5c41a9697b2207668f9e4511f27f867ac2cd1_c3JjL3JlbGVhc2VzL3NlYW1vbmtleTIuMWIyL2luZGV4LmVuLmh0bWw= 100755
--- a/src/releases/seamonkey2.1b2/index.en.html
+++ b/src/releases/seamonkey2.1b2/index.en.html
@@ -27,10 +27,10 @@
 </div>
 
 <div class="important">
-  <strong class="shout">Be careful!</strong> The SeaMonkey version
-  described this page is a testing-only preview of the next generation of
-  our Internet suite. Please test it carefully, it's not yet in a state where
-  we can encourage you to use it for daily browsing and mail operations.
+  <strong class="very-strong shout">Warning!</strong> The SeaMonkey version
+  descibed on this page is an outdated testing-only preview of
+  the next generation of our Internet suite. Please test a
+  <a href="../[% betaversion %]">newer preview version</a> instead of this one.
   <br>For daily use, we strongly advise you to download the
   <a href="../">current stable release</a> instead.
 </div>