diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index d47447f..e9beb0e 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,5 +1,5 @@
                          Commons Email Package
-                              Version 1.3.2
+                              Version 1.3.3
                               Release Notes
 
 INTRODUCTION:
@@ -15,9 +15,30 @@
 
 http://commons.apache.org/email/
 
-This is a maintenance release which fixes several bugs present in the 1.3.1
+This is a maintenance release which fixes several bugs present in the 1.3.2
 release. All current users are encouraged to upgrade.
 
+CHANGES FROM 1.3.2:
+-----------------
+
+== Compatibility ==
+
+* Java 5 or later is required (unchanged since 1.3).
+
+== Fixed Bugs ==
+
+* The filename of an attachment was not properly encoded in case it contained
+  non-ascii characters.
+  Issue: EMAIL-138. Thanks to qed.
+
+* MimeMessageParser did not correctly parse MimeMessage objects created by
+  calling HtmlEmail.buildMimeMessage() and HtmlEmail.getMimeMessage().
+  Issue: EMAIL-137. Thanks to Alex Kogan.  
+
+* Fix Javadoc 1.8 errors.
+  Issue: EMAIL-136. Thanks to Ville Skyttä.
+
+
 CHANGES FROM 1.3.1:
 -----------------
 
diff --git a/pom.xml b/pom.xml
index 75f9a7f..e56257a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-email</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.3.3</version>
     <name>Apache Commons Email</name>
 
     <inceptionYear>2001</inceptionYear>
@@ -280,7 +280,7 @@
         <commons.componentid>email</commons.componentid>
         <commons.jira.id>EMAIL</commons.jira.id>
         <commons.jira.pid>12310474</commons.jira.pid>
-        <commons.release.version>1.3.2</commons.release.version>
+        <commons.release.version>1.3.3</commons.release.version>
         <commons.rc.version>RC1</commons.rc.version>
         <commons.binary.suffix>-bin</commons.binary.suffix>
 
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 3771fb0..39098e5 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -22,7 +22,7 @@
   </properties>
 
   <body>
-    <release version="1.3.3" date="xxx">
+    <release version="1.3.3" date="2014-07-04">
       <action dev="tn" type="fix" issue="EMAIL-138" date="2014-05-06" due-to="qed">
         The filename of an attachment was not properly encoded in case it contained
         non-ascii characters.
diff --git a/src/site/site.xml b/src/site/site.xml
index 5809a07..522dfe0 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -28,7 +28,7 @@
             <item name="Download"                      href="http://commons.apache.org/email/download_email.cgi"/>
             <item name="User guide"                    href="/userguide.html"/>
             <item name="Latest API docs (development)" href="/apidocs/index.html"/>
-            <item name="Javadoc (1.3.2 release)"       href="/javadocs/api-release/index.html"/>
+            <item name="Javadoc (1.3.3 release)"       href="/javadocs/api-release/index.html"/>
             <item name="Javadoc (1.2 release)"         href="/javadocs/api-1.2/index.html"/>
         </menu>
     
diff --git a/src/site/xdoc/download_email.xml b/src/site/xdoc/download_email.xml
index 119315b..1f160ac 100644
--- a/src/site/xdoc/download_email.xml
+++ b/src/site/xdoc/download_email.xml
@@ -45,11 +45,11 @@
 -->
 <document>
   <properties>
-    <title>Download Commons Email</title>
+    <title>Download Apache Commons Email</title>
     <author email="dev@commons.apache.org">Commons Documentation Team</author>
   </properties>
   <body>
-    <section name="Download Commons Email">
+    <section name="Download Apache Commons Email">
     <subsection name="Using a Mirror">
       <p>
         We recommend you use a mirror to download our release
@@ -95,32 +95,32 @@
       </p>
     </subsection>
     </section>
-    <section name="Commons Email 1.3.2 ">
+    <section name="Apache Commons Email 1.3.3 ">
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/email/binaries/commons-email-1.3.2-bin.tar.gz">commons-email-1.3.2-bin.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/binaries/commons-email-1.3.2-bin.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/binaries/commons-email-1.3.2-bin.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/email/binaries/commons-email-1.3.3-bin.tar.gz">commons-email-1.3.3-bin.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dist/commons/email/binaries/commons-email-1.3.3-bin.tar.gz.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/email/binaries/commons-email-1.3.3-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/email/binaries/commons-email-1.3.2-bin.zip">commons-email-1.3.2-bin.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/binaries/commons-email-1.3.2-bin.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/binaries/commons-email-1.3.2-bin.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/email/binaries/commons-email-1.3.3-bin.zip">commons-email-1.3.3-bin.zip</a></td>
+              <td><a href="http://www.apache.org/dist/commons/email/binaries/commons-email-1.3.3-bin.zip.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/email/binaries/commons-email-1.3.3-bin.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
       <subsection name="Source">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/email/source/commons-email-1.3.2-src.tar.gz">commons-email-1.3.2-src.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/source/commons-email-1.3.2-src.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/source/commons-email-1.3.2-src.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/email/source/commons-email-1.3.3-src.tar.gz">commons-email-1.3.3-src.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dist/commons/email/source/commons-email-1.3.3-src.tar.gz.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/email/source/commons-email-1.3.3-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/email/source/commons-email-1.3.2-src.zip">commons-email-1.3.2-src.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/source/commons-email-1.3.2-src.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/source/commons-email-1.3.2-src.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/email/source/commons-email-1.3.3-src.zip">commons-email-1.3.3-src.zip</a></td>
+              <td><a href="http://www.apache.org/dist/commons/email/source/commons-email-1.3.3-src.zip.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/email/source/commons-email-1.3.3-src.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index ec708b3..61d134b 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -77,7 +77,7 @@
             </p>
             <ul>
                 <li>The
-                    <a href="javadocs/api-release/index.html">current release 1.3.2</a>
+                    <a href="javadocs/api-release/index.html">current release 1.3.3</a>
                 </li>
                 <li>The
                     <a href="javadocs/api-1.3/index.html">previous version 1.3</a>
@@ -99,7 +99,7 @@
         <!-- ================================================== -->
         <section name="Releases">
             <p>
-                The latest version 1.3.2, requires Java 5 -
+                The latest version 1.3.3, requires Java 5 -
                 <a href="http://commons.apache.org/email/download_email.cgi">Download now!</a>
                 <br/>
                 The full