diff --git a/artemis-distribution/src/main/resources/bin/artemis b/artemis-distribution/src/main/resources/bin/artemis
index 296fb298db..96af7afa6c 100755
--- a/artemis-distribution/src/main/resources/bin/artemis
+++ b/artemis-distribution/src/main/resources/bin/artemis
@@ -58,7 +58,7 @@ case "`uname`" in
     ;;
   Darwin*) darwin=true
     if [ -z "$JAVA_HOME" ] ; then
-     JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+     JAVA_HOME=$(/usr/libexec/java_home)
     fi
     ;;
 esac