diff --git a/changelog.html b/changelog.html
index 10f92a7f8b..d5c94b29c6 100644
--- a/changelog.html
+++ b/changelog.html
@@ -62,7 +62,11 @@ Upcoming changes</a>
 <!-- these changes are controlled by the release process. DO NOT MODIFY -->
 <div id="rc" style="display:none;"><!--=BEGIN=-->
 <h3><a name=v1.499>What's new in 1.499</a> <!--=DATE=--></h3>
-<!--=RC-CHANGES=-->
+<ul class=image>
+  <li class=bug>
+    Fixed <tt>NoClassDefFoundError: Base64</tt> with the <tt>-jnlpCredentials</tt> option.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-9679">issue 9679</a>)
+</ul>
 </div><!--=END=-->
 <h3><a name=v1.498>What's new in 1.498</a> (2013/01/07)</h3>
 <!--=RC-CHANGES=-->
diff --git a/pom.xml b/pom.xml
index 6e059f728b..86904cc212 100644
--- a/pom.xml
+++ b/pom.xml
@@ -197,7 +197,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.jenkins-ci.main</groupId>
         <artifactId>remoting</artifactId>
-        <version>2.20</version>
+        <version>2.21</version>
       </dependency>
 
       <dependency>