--- a/ChangeLog	Thu May 14 00:18:21 2009 +0100
+++ b/ChangeLog	Thu May 14 11:24:13 2009 +0100
@@ -1,3 +1,10 @@
+2009-05-14  Andrew John Hughes  <ahughes@redhat.com>
+
+	* INSTALL:
+	Add notes on using alternate HotSpot builds.
+	* NEWS:
+	Mention HotSpot bump.
+
 2009-05-14  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:

--- a/INSTALL	Thu May 14 00:18:21 2009 +0100
+++ b/INSTALL	Thu May 14 11:24:13 2009 +0100
@@ -128,3 +128,42 @@
 The additional VM's are available by calling the java with the option
 `-cacao' or `-zero' (for shark as well), or by calling the java tools with
 `-J-<vm name>'.
+
+Support for different versions of HotSpot
+----------------------------------------- 
+
+IcedTea allows the version of HotSpot provided with the upstream build
+drop to be replaced with another.  Support this is provided by the
+--with-hotspot-build option which causes IcedTea to probe the
+hotspot.map file for an entry with the given build name.  The
+hotspot.map file maps the name to a changeset from the repository
+http://hg.openjdk.java.net/hsx/hsx14/master/ which it downloads from
+http://hg.openjdk.java.net/hsx/hsx14/master/archive/${CHANGESET}.tar.gz.
+The resulting download is verified using the MD5 sum stored in
+hotspot.map.
+
+New build selections may be provided by providing further mappings in
+the hotspot.map file.  The name can be anything
+e.g. 'shiny_new_hotspot'.  This is simply used to map the argument to
+--with-hotspot-build to the values in the file and to apply
+appropriate patches (see patches/hotspot, $HSBUILD is available in
+Makefile.am for obtaining the build name).  The special value
+'original' is used to denote the upstream HotSpot and does not appear
+in hotspot.map.  The changeset should map a valid changeset in the
+HotSpot Express master repository (URL shown above).  These can be
+obtained from a local checkout or using the web interface.  The
+simplest way to calculate the MD5 sum is to download the tarball and
+then run the 'md5sum' application on it.  The resulting value should
+be added to hotspot.map.
+
+As with the OpenJDK build tarballs, the location of an alternate zip
+can be specified using --with-hotspot-src-zip.  This skips the
+download stage and just verifies that the zip's MD5 sum matches that
+of the requested build.
+
+At present, the build name 'default' is used in hotspot.map to provide
+the latest version of HotSpot 14 in place of the version of HotSpot 11
+provided by upstream.  Thus, --with-hotspot-build is enabled by
+default, and either --without-hotspot-build or
+--with-hotspot-build=original is required to revert to the upstream
+HotSpot.

--- a/NEWS	Thu May 14 00:18:21 2009 +0100
+++ b/NEWS	Thu May 14 11:24:13 2009 +0100
@@ -1,4 +1,4 @@
-New in release 1.X (UNRELEASED)
+New in release 1.5 (UNRELEASED)
 
 - Static trace support through systemtap.
   When given the configure option --enable-systemtap IcedTea will build
@@ -10,6 +10,8 @@
   virtual machines on architectures where hotspot is available are cacao
   and zero (or shark), and cacao, where zero (or shark) is available. It's
   not possible to build cacao as the default VM, and zero as additional VM.
+- Update to latest HotSpot minor build (hs14b10-->hs14b15) from the new
+  HotSpot Express repository.
 
 New in release 1.4 (2009-01-29)