--- a/ChangeLog	Wed May 25 01:42:05 2011 +0100
+++ b/ChangeLog	Wed May 25 01:48:54 2011 +0100
@@ -1,3 +1,10 @@
+2011-02-23  Andrew John Hughes  <ahughes@redhat.com>
+
+	* INSTALL:
+	Update with native2ascii option and JamVM.
+	Mention --without-hotspot-build in HotSpot
+	documentation.
+
 2011-02-22  Andrew John Hughes  <ahughes@redhat.com>
 
 	Use more accurate ENABLE_CACAO rather

--- a/INSTALL	Wed May 25 01:42:05 2011 +0100
+++ b/INSTALL	Wed May 25 01:48:54 2011 +0100
@@ -113,6 +113,9 @@
   is checked for gjavah and javah.
 * --with-rmic: Specify the location of a 'rmic' binary.  By default, the path
   is checked for grmic and rmic.
+* --with-native2ascii:  Specify the location of a 'native2ascii' binary.  By default,
+  ${SYSTEM_JDK_DIR}/bin/native2ascii is used.  If this is absent, then the path
+  is checked for native2ascii and gnative2ascii.
 * --with-ecj-jar: Specify the location of an ecj JAR file.  By default, the
   following paths are checked:
     - /usr/share/java/eclipse-ecj.jar
@@ -171,6 +174,7 @@
 * --enable-systemtap: Include support for tracing using systemtap.
 * --enable-nss: Enable the NSS security provider.
 * --enable-cacao: Replace HotSpot with the CACAO VM.
+* --enable-jamvm: Replace HotSpot with JamVM.
 * --enable-shark: Build the Shark LLVM-based JIT.
 * --enable-zero: Build the zero assembler port on x86/x86_64/sparc platforms.
 * --with-hotspot-build: The HotSpot to use, defaulting to 'original' i.e. hs14 as bundled with OpenJDK.
@@ -250,6 +254,14 @@
 instead, and --with-cacao-src-zip/dir options exist to allow the use
 of a pre-downloaded zip or source tree respectively.
 
+JamVM
+=====
+
+IcedTea6 can use JamVM as the virtual machine, as opposed to HotSpot.
+When --enable-jamvm is specified, JamVM will be downloaded and built,
+followed by the JDK portion of OpenJDK resulting in a JamVM+OpenJDK
+image in openjdk/build/<os>-<arch>/j2sdk-image.
+
 Zero & Shark
 ============