diff --git a/bindings/java/hyperic_jni/jni-build.xml b/bindings/java/hyperic_jni/jni-build.xml
index 3601e133..3dbb548c 100644
--- a/bindings/java/hyperic_jni/jni-build.xml
+++ b/bindings/java/hyperic_jni/jni-build.xml
@@ -54,15 +54,6 @@ USA.
     <condition property="jni.javahome" value="${env.JAVA_HOME}">
       <isset property="env.JAVA_HOME"/>
     </condition>
-    <condition property="jni.javahome" value="${java.home}">
-      <not>
-        <isset property="jni.javahome"/>
-      </not>
-    </condition>
-
-    <echo>java.home=${jni.javahome}</echo>
-
-    <checksum file="${jni.javahome}/include/jni.h" property="jni.md5"/>
 
     <condition property="linux">
       <equals arg1="${os.name}" arg2="Linux"/>
@@ -180,6 +171,10 @@ USA.
 
     <libarch/>
 
+    <echo>java.home=${jni.javahome}</echo>
+
+    <checksum file="${jni.javahome}/include/jni.h" property="jni.md5"/>
+
     <property name="jni.project.archname"
               value="${project.name}-${jni.libarch}"/>
 
diff --git a/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java b/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java
index 5a991b99..46bf2976 100644
--- a/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java
+++ b/bindings/java/hyperic_jni/src/org/hyperic/jni/ArchNameTask.java
@@ -138,6 +138,17 @@ public class ArchNameTask extends Task {
             }
         }
         getProject().setProperty("jni.scmrev", getSourceRevision());
+
+        //jni.javahome required to find include/jni.h
+        String home = getProject().getProperty("jni.javahome");
+        if (home == null) {
+            home = System.getProperty("java.home");
+        }
+        File dir = new File(home);
+        if (!new File(dir, "include").exists()) {
+            dir = dir.getParentFile(); //was /jre
+        }
+        getProject().setProperty("jni.javahome", dir.getPath());
     }
 
     //XXX source rev stuff should be in another task