diff --git a/distro-source/core/src/index.html b/distro-source/core/src/index.html
index aa970a3..3cf15b9 100644
--- a/distro-source/core/src/index.html
+++ b/distro-source/core/src/index.html
@@ -40,9 +40,9 @@
       <p>Ajax is hard.  But you're not alone!</p>
       <ul>
          <li>
-            <a href="http://code.google.com/docreader/?p(google-web-toolkit-doc-1-6)s(google-web-toolkit-doc-1-6)t(ReleaseNotes_1_6)">What's new in GWT 1.6?</a> (online)
+            <a href="http://code.google.com/webtoolkit/doc/1.6/ReleaseNotes_1_6.html">What's new in GWT 1.6?</a> (online)
             <div>
-              <a href="release_notes.html">Point releases notes</a> are also available locally.
+              <a href="release_notes.html">Point releases notes</a> are also included in the distribution.
             </div>
          </li>
          <li>
@@ -67,7 +67,7 @@
             </div>
          </li>
          <li>
-            <a href="http://code.google.com/docreader/?p=google-web-toolkit-doc-1-6&s=google-web-toolkit-doc-1-6&t=FAQ">Frequently Asked Questions</a> (online)
+            <a href="http://code.google.com/webtoolkit/doc/1.6/FAQ.html">Frequently Asked Questions</a> (online)
             <div>
                Answers to the initial questions developers have about using GWT, including licensing, upgrades, and so on.
             </div>
@@ -82,20 +82,20 @@
             </div>
          </li>
          <li>
-            <a href="http://code.google.com/docreader/?p=google-web-toolkit-doc-1-6&s=google-web-toolkit-doc-1-6&t=DevGuideDeveloperGuide">Developer Guide</a> (online)
+            <a href="http://code.google.com/webtoolkit/doc/1.6/DevGuide.html">Developer Guide</a> (online)
             <div>
                The Developer Guide explains the key concepts in GWT.
             </div>
          </li>
          <li>
-            <a href="http://code.google.com/docreader/?p=google-web-toolkit-doc-1-6&s=google-web-toolkit-doc-1-6&t=DevGuideWidgetGallery">
+            <a href="http://code.google.com/webtoolkit/doc/1.6/RefWidgetGallery.html">
                Widget Gallery</a> (online)
             <div>
                Browse some of the built-in GWT widgets and panels.
             </div>
          </li>
          <li>
-            <a href="http://code.google.com/docreader/?p=google-web-toolkit-doc-1-6&s=google-web-toolkit-doc-1-6&t=DevGuideCommandLineTools">Command-line 
+            <a href="http://code.google.com/webtoolkit/doc/1.6/RefCommandLineTools.html">Command-line 
                Tools</a> (online)
             <div>
                Scripts to help you get started with GWT projects.
diff --git a/distro-source/core/src/release_notes.html b/distro-source/core/src/release_notes.html
index eb00bcf..c60fcee 100644
--- a/distro-source/core/src/release_notes.html
+++ b/distro-source/core/src/release_notes.html
@@ -29,6 +29,7 @@
       <h1>Google Web Toolkit Release Notes</h1>
       <ul>
 		    <li><a href="#Release_Notes_Current">@GWT_VERSION@</a></li>
+        <li><a href="#Release_Notes_1_6_3">1.6.3</a></li>
 		    <li><a href="#Release_Notes_1_6_2">1.6.2</a></li>
 		    <li><a href="#Release_Notes_1_5_3">1.5.3</a></li>
 		    <li><a href="#Release_Notes_1_5_2">1.5.2</a></li>
@@ -51,6 +52,14 @@
       <h2>Release Notes for @GWT_VERSION@</h2>
       <h3>Fixed Issues</h3>
       <ul>
+        <li>The classpath in the scripts created by junitCreator was updated to refer to <code>/war/WEB-INF/classes</code> rather than <code>/bin</code>.</li>
+      </ul>
+
+      <hr/>
+      <a name="Release_Notes_1_6_3"></a>
+      <h2>Release Notes for 1.6.3 (RC2)</h2>
+      <h3>Fixed Issues</h3>
+      <ul>
         <li>Various <a href="http://code.google.com/p/google-web-toolkit/issues/detail?id=3496">servlet classpath issues</a> introduced in 1.6.2 are resolved.</li>
         <li>JSP compilation should work out of the box in hosted mode.</li>
       </ul>
@@ -59,7 +68,7 @@
       <a name="Release_Notes_1_6_2"></a>
       <h2>Release Notes for 1.6.2 (RC)</h2>
       <p>
-         Please see <a href="http://code.google.com/docreader/?p(google-web-toolkit-doc-1-6)s(google-web-toolkit-doc-1-6)t(ReleaseNotes_1_6)">What's new in GWT 1.6?</a> (online)
+         Please see <a href="http://code.google.com/webtoolkit/doc/1.6/ReleaseNotes_1_6.html">What's new in GWT 1.6?</a> (online)
       </p>
 
       <hr/>
diff --git a/user/src/com/google/gwt/junit/tools/junit-hosted.cmdsrc b/user/src/com/google/gwt/junit/tools/junit-hosted.cmdsrc
index 2e25daf..37b2d96 100644
--- a/user/src/com/google/gwt/junit/tools/junit-hosted.cmdsrc
+++ b/user/src/com/google/gwt/junit/tools/junit-hosted.cmdsrc
@@ -1 +1 @@
-@java -Dgwt.args="-out www-test" -Xmx256M -cp "%~dp0\src;%~dp0\test;%~dp0\bin;@junitPath;@gwtUserPath;@gwtDevPath@extraClassPathsSemicolon" junit.textui.TestRunner @clientPackage.@className %*
\ No newline at end of file
+@java -Dgwt.args="-out www-test" -Xmx256M -cp "%~dp0\src;%~dp0\test;%~dp0\war\WEB-INF\classes;@junitPath;@gwtUserPath;@gwtDevPath@extraClassPathsSemicolon" junit.textui.TestRunner @clientPackage.@className %*
\ No newline at end of file
diff --git a/user/src/com/google/gwt/junit/tools/junit-hostedsrc b/user/src/com/google/gwt/junit/tools/junit-hostedsrc
index 44c275b..81bd88b 100644
--- a/user/src/com/google/gwt/junit/tools/junit-hostedsrc
+++ b/user/src/com/google/gwt/junit/tools/junit-hostedsrc
@@ -1,3 +1,3 @@
 #!/bin/sh
 APPDIR=`dirname $0`;
-java @vmargs -Dgwt.args="-out www-test" -Xmx256M -cp "$APPDIR/src:$APPDIR/test:$APPDIR/bin:@junitPath:@gwtUserPath:@gwtDevPath@extraClassPathsColon" junit.textui.TestRunner @clientPackage.@className "$@";
+java @vmargs -Dgwt.args="-out www-test" -Xmx256M -cp "$APPDIR/src:$APPDIR/test:$APPDIR/war/WEB-INF/classes:@junitPath:@gwtUserPath:@gwtDevPath@extraClassPathsColon" junit.textui.TestRunner @clientPackage.@className "$@";
diff --git a/user/src/com/google/gwt/junit/tools/junit-web.cmdsrc b/user/src/com/google/gwt/junit/tools/junit-web.cmdsrc
index ac61775..7f88577 100644
--- a/user/src/com/google/gwt/junit/tools/junit-web.cmdsrc
+++ b/user/src/com/google/gwt/junit/tools/junit-web.cmdsrc
@@ -1 +1 @@
-@java -Dgwt.args="-web -out www-test" -Xmx256M -cp "%~dp0\src;%~dp0\test;%~dp0\bin;@junitPath;@gwtUserPath;@gwtDevPath@extraClassPathsSemicolon" junit.textui.TestRunner @clientPackage.@className %*
\ No newline at end of file
+@java -Dgwt.args="-web -out www-test" -Xmx256M -cp "%~dp0\src;%~dp0\test;%~dp0\war\WEB-INF\classes;@junitPath;@gwtUserPath;@gwtDevPath@extraClassPathsSemicolon" junit.textui.TestRunner @clientPackage.@className %*
\ No newline at end of file
diff --git a/user/src/com/google/gwt/junit/tools/junit-websrc b/user/src/com/google/gwt/junit/tools/junit-websrc
index 918b68a..d938d34 100644
--- a/user/src/com/google/gwt/junit/tools/junit-websrc
+++ b/user/src/com/google/gwt/junit/tools/junit-websrc
@@ -1,3 +1,3 @@
 #!/bin/sh
 APPDIR=`dirname $0`;
-java @vmargs -Dgwt.args="-web -out www-test" -Xmx256M -cp "$APPDIR/src:$APPDIR/test:$APPDIR/bin:@junitPath:@gwtUserPath:@gwtDevPath@extraClassPathsColon" junit.textui.TestRunner @clientPackage.@className "$@";
+java @vmargs -Dgwt.args="-web -out www-test" -Xmx256M -cp "$APPDIR/src:$APPDIR/test:$APPDIR/war/WEB-INF/classes:@junitPath:@gwtUserPath:@gwtDevPath@extraClassPathsColon" junit.textui.TestRunner @clientPackage.@className "$@";