--- a/ChangeLog	Thu Sep 30 14:37:42 2010 +0100
+++ b/ChangeLog	Thu Sep 30 14:59:01 2010 +0100
@@ -1,3 +1,17 @@
+2010-09-30  Andrew John Hughes  <ahughes@redhat.com>
+
+	* INSTALL: Mention new hs19 option.
+	* NEWS: Add HotSpot 19 and S390 fix.
+	* acinclude.m4:
+	(AC_CHECK_WITH_HOTSPOT_BUILD): Set
+	ALTERNATE_BUILD to hs19 rather than the
+	non-existent hs16 (used when
+	--with-hotspot-build or
+	--with-hotspot-build=yes is passed).
+	This has been renamed from DEFAULT_BUILD
+	which now correctly refers to
+	the actual default ('original').
+
 2010-09-22  Andrew John Hughes  <ahughes@redhat.com>
 
 	* ports/hotspot/make/linux/makefiles/shark.make,

--- a/INSTALL	Thu Sep 30 14:37:42 2010 +0100
+++ b/INSTALL	Thu Sep 30 14:59:01 2010 +0100
@@ -165,7 +165,7 @@
 * --enable-zero: Build the zero assembler port on x86/x86_64/sparc platforms.
 * --disable-plugin: Don't build the browser plugin.
 * --disable-npplugin: Build the old unsupported plugin rather than NPPlugin.
-* --with-hotspot-build: The HotSpot to use, defaulting to 'original' i.e. hs14 as bundled with OpenJDK.
+* --with-hotspot-build: The HotSpot to use, defaulting to 'original' i.e. hs17 as bundled with OpenJDK.
 * --with-rhino: Include Javascript support using Rhino.
 * --with-additional-vms=vm-list: Additional VMs to build using the system described
   below.
@@ -318,8 +318,15 @@
 download stage and just verifies that the zip's MD5 sum matches that
 of the requested build.
 
-At present, IcedTea6 only supports the 'original' HotSpot (hs17)
-provided as part of the upstream tarball.
+At present, IcedTea6 supports the 'original' HotSpot 17 provided as
+part of the upstream tarball and HotSpot 19 ('hs19') from the stable
+hs19 tree at http://hg.openjdk.java.net/hsx/hsx19/master.  The default
+is 'original'; passing --with-hotspot-build=hs19 to configure will
+download and build with HotSpot 19.  Note that the norm. is for up to
+one alternate (non-default) build to be supported and just passing
+--with-hotspot-build (equivalent to --with-hotspot-build=yes) will
+cause the alternate HotSpot to be used (currently hs19).  Conversely,
+passing --with-hotspot-build=no retains the default.
 
 Javascript Support
 ==================

--- a/NEWS	Thu Sep 30 14:37:42 2010 +0100
+++ b/NEWS	Thu Sep 30 14:59:01 2010 +0100
@@ -9,9 +9,11 @@
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
 New in release 1.9.1 (2010-XX-XX):
-* Netx
+* HotSpot 19 supported; use --with-hotspot-build=hs19 to enable.
+* NetX
  - New man page for javaws
-
+* Fixes
+ - Fix build failure on S390
 
 New in release 1.9 (2010-09-07):
 

--- a/acinclude.m4	Thu Sep 30 14:37:42 2010 +0100
+++ b/acinclude.m4	Thu Sep 30 14:59:01 2010 +0100
@@ -938,7 +938,8 @@
 
 AC_DEFUN([AC_CHECK_WITH_HOTSPOT_BUILD],
 [
-  DEFAULT_BUILD="hs16"
+  DEFAULT_BUILD="original"
+  ALTERNATE_BUILD="hs19"
   AC_MSG_CHECKING([which HotSpot build to use])
   AC_ARG_WITH([hotspot-build],
 	      [AS_HELP_STRING(--with-hotspot-build,the HotSpot build to use (see hotspot.map))],
@@ -946,16 +947,16 @@
     HSBUILD="${withval}"
   ],
   [ 
-    HSBUILD="original"
+    HSBUILD="${DEFAULT_BUILD}"
   ])
   if test "x${HSBUILD}" = xyes; then
-	HSBUILD="${DEFAULT_BUILD}"
+	HSBUILD="${ALTERNATE_BUILD}"
   elif test "x${HSBUILD}" = xno; then
-	HSBUILD="original"
+	HSBUILD="${DEFAULT_BUILD}"
   fi
   AC_MSG_RESULT([${HSBUILD}])
   AC_SUBST([HSBUILD])
-  AM_CONDITIONAL(WITH_ALT_HSBUILD, test "x${HSBUILD}" != "xoriginal")
+  AM_CONDITIONAL(WITH_ALT_HSBUILD, test "x${HSBUILD}" != "x${DEFAULT_BUILD}")
 ])
 
 AC_DEFUN([WITH_HOTSPOT_SRC_ZIP],