--- a/ChangeLog	Thu Jun 06 14:28:36 2013 +0100
+++ b/ChangeLog	Thu Jun 06 17:03:19 2013 +0100
@@ -1,3 +1,23 @@
+2013-06-06  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* INSTALL:
+	Synchronise list of VMs with macro in acinclude.m4.
+	* acinclude.m4: Provide separate output for user
+	specified JDKs and the checking process.  Extend
+	the list of JVMs to include more from Fedora &
+	RHEL and the newer Gentoo variants.
+	* NEWS: Updated.
+
+2013-03-21  Michal Vyskocil  <mvyskocil@suse.cz>
+
+	PR1360: Check for /usr/lib64 JVMs and generic JPackage alternative
+	* INSTALL: Add /etc/alternatives/java_sdk_openjdk.
+	* acinclude.m4: Likewise.
+
+2013-06-06  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* AUTHORS: Updated with Michal.
+
 2013-03-21  Michal Vyskocil  <mvyskocil@suse.cz>
 
 	PR1358: Make XRender mandatory.

--- a/INSTALL	Thu Jun 06 14:28:36 2013 +0100
+++ b/INSTALL	Thu Jun 06 17:03:19 2013 +0100
@@ -49,11 +49,16 @@
 make
 
 The following locations are checked for a JDK:
-    * /usr/lib/jvm/java-openjdk
+    * /usr/lib/jvm/icedtea-6
     * /usr/lib/jvm/icedtea6
     * /usr/lib/jvm/java-6-openjdk
+    * /usr/lib/jvm/java-1.6.0-openjdk.x86_64
+    * /usr/lib64/jvm/java-1.6.0-openjdk
+    * /usr/lib/jvm/java-1.6.0
+    * /usr/lib/jvm/java-openjdk
     * /usr/lib/jvm/openjdk
     * /usr/lib/jvm/java-icedtea
+    * /etc/alternatives/java_sdk_openjdk
 in the order given above.
 
 If bootstrapping is enabled, the following JDK locations are prepended to the above list:

--- a/NEWS	Thu Jun 06 14:28:36 2013 +0100
+++ b/NEWS	Thu Jun 06 17:03:19 2013 +0100
@@ -811,6 +811,8 @@
   - PR1378: Add AArch64 support to Zero
   - PR1170: Ensure unlimited crypto policy is in place.
   - RH513605, PR1280: Updating/Installing OpenJDK should recreate the shared class-data archive
+  - PR1358: Make XRender mandatory
+  - PR1360: Check for /usr/lib64 JVMs and generic JPackage alternative
 * CACAO
   - src/vm/jit/x86_64/asmpart.S (asm_abstractmethoderror): Keep stack aligned.
   - src/native/jni.cpp (GetObjectClass): Remove null pointer check.

--- a/acinclude.m4	Thu Jun 06 14:28:36 2013 +0100
+++ b/acinclude.m4	Thu Jun 06 17:03:19 2013 +0100
@@ -1132,21 +1132,31 @@
 	        SYSTEM_JDK_DIR=
               ])
   if test -z "${SYSTEM_JDK_DIR}"; then
+    AC_MSG_RESULT([not specified])
     if test "x${enable_bootstrap}" = "xyes"; then
       BOOTSTRAP_VMS="/usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk /usr/lib/jvm/cacao";
-    else
-      ICEDTEA6_VMS="/usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk"
     fi
-    ICEDTEA7_VMS="/usr/lib/jvm/icedtea7 /usr/lib/jvm/java-1.7.0-openjdk"
+    ICEDTEA6_VMS="/usr/lib/jvm/icedtea-6 /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk
+    		  /usr/lib/jvm/java-1.6.0-openjdk.x86_64 /usr/lib64/jvm/java-1.6.0-openjdk
+		  /usr/lib/jvm/java-1.6.0"
+    ICEDTEA7_VMS="/usr/lib/jvm/icedtea-7 /usr/lib/jvm/icedtea7 /usr/lib/jvm/java-1.7.0-openjdk
+    		  /usr/lib/jvm/java-1.7.0-openjdk.x86_64 /usr/lib64/jvm/java-1.7.0-openjdk
+		  /usr/lib/jvm/java-1.7.0"
     for dir in ${BOOTSTRAP_VMS} ${ICEDTEA7_VMS} ${ICEDTEA6_VMS} \
-    	       /usr/lib/jvm/java-openjdk /usr/lib/jvm/openjdk /usr/lib/jvm/java-icedtea ; do
+    	       /usr/lib/jvm/java-openjdk /usr/lib/jvm/openjdk /usr/lib/jvm/java-icedtea \
+	       /etc/alternatives/java_sdk_openjdk ; do
+       AC_MSG_CHECKING([for ${dir}]);
        if test -d $dir; then
-         SYSTEM_JDK_DIR=$dir
-	 break
+         SYSTEM_JDK_DIR=$dir ;
+	 AC_MSG_RESULT([found]) ;
+	 break ;
+       else
+         AC_MSG_RESULT([not found]) ;
        fi
     done
+  else
+    AC_MSG_RESULT(${SYSTEM_JDK_DIR})
   fi
-  AC_MSG_RESULT(${SYSTEM_JDK_DIR})
   if ! test -d "${SYSTEM_JDK_DIR}"; then
     AC_MSG_ERROR("A JDK JDK home directory could not be found.")
   fi