diff --git a/binding.gyp b/binding.gyp
index 35d1e919..ea83c4af 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -6,13 +6,13 @@
         'arch%': 'i386'
       }],
       ['OS=="win"', {
-        'javahome%': '<!(echo %JAVA_HOME%)'
+        'javahome%': '<!(node findJavaHome.js)'
       }],
       ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', {
-        'javahome%': '<!(echo $JAVA_HOME)'
+        'javahome%': '<!(node findJavaHome.js)'
       }],
       ['OS=="mac"', {
-      	'javaver%' : "<!(awk -F/ -v h=$JAVA_HOME 'BEGIN {n=split(h, a); print a[2]; exit}')"
+      	'javaver%' : "<!(awk -F/ -v h=`node findJavaHome.js` 'BEGIN {n=split(h, a); print a[2]; exit}')"
       }]
     ]
   },
diff --git a/findJavaHome.js b/findJavaHome.js
new file mode 100644
index 00000000..2421daf6
--- /dev/null
+++ b/findJavaHome.js
@@ -0,0 +1,7 @@
+require('find-java-home')(function(err, home){
+  if(err){
+    console.error("[node-java] "+err);
+    process.exit(1);
+  }
+  process.stdout.write(home);
+});
diff --git a/package.json b/package.json
index bcbd2d19..ba22ed59 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "url": "https://github.com/joeferner/node-java.git"
   },
   "dependencies": {
+    "find-java-home": "0.0.3"
   },
   "devDependencies": {
     "nodeunit": "~0.6.4",