--- a/ChangeLog	Tue May 19 13:14:09 2009 +0200
+++ b/ChangeLog	Tue May 19 09:46:57 2009 -0400
@@ -1,3 +1,8 @@
+2009-05-18  Lillian Angel  <langel@redhat.com>
+
+	* README: Updated plugin docs.
+	* NEWS: Fixed typo.
+
 2009-05-18  Robert Schuster  <robertschuster@fsfe.org>
 
 	* NEWS: Added note about cross-compilation support.

--- a/NEWS	Tue May 19 13:14:09 2009 +0200
+++ b/NEWS	Tue May 19 09:46:57 2009 -0400
@@ -1,4 +1,4 @@
-New in release 1.5 (2009-05-15)
+New in release 1.5 (2009-05-20)
 
 - Static trace support through systemtap.
   When given the configure option --enable-systemtap IcedTea will build
@@ -13,7 +13,7 @@
 - Update to latest HotSpot minor build (hs14b10-->hs14b15) from the new
   HotSpot Express repository.
 - Updated to OpenJDK b16 build.
-- Visual VM updated to 1.1.1.
+- VisualVM updated to 1.1.1.
 - Updated to support CACAO 0.99.4.
 - Several web browser plugin and javaws support fixes:
   - Fixed security handling to prevent access denials when there is a site

--- a/README	Tue May 19 13:14:09 2009 +0200
+++ b/README	Tue May 19 09:46:57 2009 -0400
@@ -88,38 +88,17 @@
    openjdk/jdk/src/share/classes/**/resources/*.properties
 
 
-gcjwebplugin
-============
-
-gcjwebplugin provides basic support for running applets in
-Mozilla-based web browsers.  It does not support applet/Javascript
-communication (LiveConnect) and support for signed applets needs
-further testing.  The current applet security manager may be too
-strict and may require tuning to allow otherwise-legitimate calls by
-untrusted applets.
+Web Browser Plugin support
+===========================
 
-gcjwebplugin itself is a shared object, gcjwebplugin.so, built from a
-single source file, gcjwebplugin.cc.  The IcedTea adaptation of
-gcjwebplugin communicates through named pipes with a modified version
-of IcedTea's appletviewer.  Two source files,
-openjdk/jdk/src/share/classes/sun/applet/PluginAppletViewer.java,
-openjdk/jdk/src/share/classes/sun/applet/PluginMain.java are added to
-rt.jar and tools.jar to provide gcjwebplugin with an interface into
-the appletviewer code.  This support code is provided in
-patches/icedtea-plugin.patch.
+The default web browser plugin has LiveConnect support. It will only build
+against a very recent version of XULRunner, such as that available in Fedora
+Rawhide as of 2008-05-16.  The required development headers are provided by 
+the xulrunner-devel package.
 
-Experimental LiveConnect support
-================================
-
-The configure option --enable-liveconnect enables experimental
-LiveConnect support, implemented by IcedTeaPlugin.cc and
-patches/icedtea-liveconnect.patch.  Currently IcedTeaPlugin.cc will
-only build against a very recent version of XULRunner, such as that
-available in Fedora Rawhide as of 2008-02-23.  The required
-development headers are provided by the xulrunner-devel package.
-
-To run IcedTeaPlugin you'll need to add
-/usr/lib/xulrunner-sdk-1.9pre/sdk/lib/ to LD_LIBRARY_PATH.
+A new plugin is being developed to support the new Mozilla API changes. It can
+be enabled with the option --enable-npplugin, and it is based on gcjwebplugin. 
+At the moment there is no liveconnect support for it.
 
 NetX
 ====

Binary file generated/sun/awt/X11/generator/sizer.32 has changed

--- a/generated/sun/misc/Version.java	Tue May 19 13:14:09 2009 +0200
+++ b/generated/sun/misc/Version.java	Tue May 19 09:46:57 2009 -0400
@@ -39,7 +39,13 @@
         "OpenJDK Runtime Environment";
 
     private static final String java_runtime_version =
-        "1.6.0_0-b12";
+        "1.6.0_0-b16";
+
+    private static final String jdk_derivative_name =
+        "IcedTea6 1.5-r926c38e2b283";
+
+    private static final String distro_package_version =
+        "";
 
     static {
         init();
@@ -81,12 +87,26 @@
         /* First line: platform version. */
         ps.println(launcher_name + " version \"" + java_version + "\"");
 
+        String java_vm_name    = System.getProperty("java.vm.name");
+
         /* Second line: runtime version (ie, libraries). */
-        ps.println(java_runtime_name + " (build " +
-                           java_runtime_version + ")");
+	StringBuilder sb = new StringBuilder();
+	if (java_vm_name.toLowerCase().startsWith("cacao")) {
+	    sb.append("IcedTea Runtime Environment");
+	} else {
+	    sb.append(java_runtime_name);
+	}
+	if (jdk_derivative_name.length() > 0) {
+	    sb.append(" (").append(jdk_derivative_name).append(")");
+	}
+	if (distro_package_version.length() > 0) {
+	    sb.append(" (").append(distro_package_version).append(")");
+	} else {
+	    sb.append(" (build ").append(java_runtime_version).append(")");
+	}
+	ps.println(sb.toString());
 
         /* Third line: JVM information. */
-        String java_vm_name    = System.getProperty("java.vm.name");
         String java_vm_version = System.getProperty("java.vm.version");
         String java_vm_info    = System.getProperty("java.vm.info");
         ps.println(java_vm_name + " (build " + java_vm_version + ", " +