diff --git a/cmake/FindJulia.cmake b/cmake/FindJulia.cmake
index 77c9f7f8..2d4e1f6a 100644
--- a/cmake/FindJulia.cmake
+++ b/cmake/FindJulia.cmake
@@ -1,83 +1,89 @@
 if(JULIA_FOUND)
     return()
 endif()
-    
+
 # Find julia executable
 find_program(JULIA_EXECUTABLE julia DOC "Julia executable")
 
 if(NOT JULIA_EXECUTABLE)
     return()
 endif()
 
 
 
 
 #
 # Julia version
 #
 execute_process(
     COMMAND ${JULIA_EXECUTABLE} --version
     OUTPUT_VARIABLE JULIA_VERSION_STRING
     RESULT_VARIABLE RESULT
 )
 if(RESULT EQUAL 0)
   string(REGEX REPLACE ".*([0-9]+\\.[0-9]+\\.[0-9]+).*" "\\1"
       JULIA_VERSION_STRING ${JULIA_VERSION_STRING})
 endif()
 
 
 
 
 #
 # Julia includes
 #
+if(${JULIA_VERSION_STRING} VERSION_LESS 0.7.0)
+    set(JULIA_BINDIR "JULIA_HOME")
+else()
+    set(JULIA_BINDIR "Sys.BINDIR")
+endif()
+
 execute_process(
-    COMMAND ${JULIA_EXECUTABLE} -E "joinpath(match(r\"(.*)(bin)\",JULIA_HOME).captures[1],\"include\",\"julia\")"
+    COMMAND ${JULIA_EXECUTABLE} -E "joinpath(match(r\"(.*)(bin)\",${JULIA_BINDIR}).captures[1],\"include\",\"julia\")"
     OUTPUT_VARIABLE JULIA_INCLUDE_DIRS
     # COMMAND ${JULIA_EXECUTABLE} -E "abspath(joinpath(JULIA_HOME, \"../..\", \"src\"))"
     # OUTPUT_VARIABLE JULIA_INCLUDE_DIRS
     RESULT_VARIABLE RESULT
 )
 if(RESULT EQUAL 0)
     string(REGEX REPLACE "\"" "" JULIA_INCLUDE_DIRS ${JULIA_INCLUDE_DIRS})
     set(JULIA_INCLUDE_DIRS ${JULIA_INCLUDE_DIRS}
         CACHE PATH "Location of Julia include files")
 endif()
 
 string(CONCAT JULIA_INCLUDE_TEST_FILE ${JULIA_INCLUDE_DIRS} "/julia_version.h")
 string(REGEX REPLACE "\n" "" JULIA_INCLUDE_TEST_FILE ${JULIA_INCLUDE_TEST_FILE})
 IF (NOT EXISTS ${JULIA_INCLUDE_TEST_FILE})
     message(STATUS "Julia found, but include files are missing")
     return()
 endif()
 
 
 #
 # Julia library location
 #
 execute_process(
     COMMAND ${JULIA_EXECUTABLE} -E "abspath(dirname(Libdl.dlpath(\"libjulia\")))"
     OUTPUT_VARIABLE JULIA_LIBRARY_DIR
     RESULT_VARIABLE RESULT
 )
 
 if(RESULT EQUAL 0)
     string(REGEX REPLACE "\"" "" JULIA_LIBRARY_DIR ${JULIA_LIBRARY_DIR})
     string(STRIP ${JULIA_LIBRARY_DIR} JULIA_LIBRARY_DIR)
     set(JULIA_LIBRARY_DIR ${JULIA_LIBRARY_DIR}
         CACHE PATH "Julia library directory")
 endif()
 
 find_library( JULIA_LIBRARY
     NAMES julia
     PATHS ${JULIA_LIBRARY_DIR}
 )
 
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
     Julia
     REQUIRED_VARS   JULIA_LIBRARY JULIA_LIBRARY_DIR JULIA_INCLUDE_DIRS
     VERSION_VAR     JULIA_VERSION_STRING
     FAIL_MESSAGE    "Julia not found"
-)
\ No newline at end of file
+)