diff --git a/build.properties b/build.properties
index fcdbbaf..2ceb69c 100644
--- a/build.properties
+++ b/build.properties
@@ -1,3 +1,2 @@
 path.variable.kotlin_bundled=/Applications/IntelliJ IDEA 15 CE.app/Contents/plugins/Kotlin/kotlinc
-path.variable.maven_repository=/Users/vidstige/.m2/repository
-jdk.home.1.6=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
\ No newline at end of file
+path.variable.maven_repository=/Users/vidstige/.m2/repository
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 4bf0dc2..fb92e35 100644
--- a/build.xml
+++ b/build.xml
@@ -3,11 +3,9 @@
   
   
   <property file="build.properties"/>
-  <!-- Uncomment the following property if no tests compilation is needed -->
-  <!-- 
-  <property name="skip.tests" value="true"/>
-   -->
-  
+  <property environment="env"/>
+  <property name="jdk.home.1.6" value="${env.JAVA_HOME}"/>
+
   <!-- Compiler options -->
   
   <property name="compiler.debug" value="on"/>
@@ -55,7 +53,7 @@
   </patternset>
   
   <!-- JDK definitions -->
-  
+
   <property name="jdk.bin.1.6" value="${jdk.home.1.6}/bin"/>
   <path id="jdk.classpath.1.6">
     <fileset dir="${jdk.home.1.6}">
@@ -132,6 +130,6 @@
   <target name="all" depends="build.modules, build.all.artifacts" description="build all"/>
 
   <target name="test" depends="build.modules">
-    
+
   </target>
 </project>
\ No newline at end of file