diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1bad6499c13a3af87ffed1fe77a8cf0dacc64234..a0144f0608c7ae8eb579d798e4af69eeeb0db12f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,8 @@ project(hcana VERSION 0.90 LANGUAGES CXX)
 
 option(HCANA_BUILTIN_PODD "Use built-in Podd submodule (default: YES)" OFF)
 
+include(cmake/os.cmake)
+
 find_package(ROOT 6.0 REQUIRED CONFIG)
 include(${ROOT_USE_FILE})
 
diff --git a/cmake/HCANAConfig.cmake.in b/cmake/HCANAConfig.cmake.in
deleted file mode 100644
index 57b242a892bb56cb74876ab27c928a6054f5427a..0000000000000000000000000000000000000000
--- a/cmake/HCANAConfig.cmake.in
+++ /dev/null
@@ -1,27 +0,0 @@
-@PACKAGE_INIT@
-
-include("@PACKAGE_TARGETS_INSTALL_PATH@")
-
-check_required_components(HCANA)
-
-find_package(PODD REQUIRED)
-message(STATUS "Found HCANA")
-
-#get_filename_component(HCANA_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-#include(CMakeFindDependencyMacro)
-#
-#list(APPEND CMAKE_MODULE_PATH ${HCANA_CMAKE_DIR})
-#
-## NOTE Had to use find_package because find_dependency does not support COMPONENTS or MODULE until 3.8.0
-#
-##find_dependency(Boost 1.55 REQUIRED COMPONENTS regex)
-##find_dependency(RapidJSON 1.0 REQUIRED MODULE)
-##find_package(Boost 1.55 REQUIRED COMPONENTS regex)
-##find_package(RapidJSON 1.0 REQUIRED MODULE)
-#list(REMOVE_AT CMAKE_MODULE_PATH -1)
-#
-#if(NOT TARGET HCANA::PODD)
-#    include("${HCANA_CMAKE_DIR}/PODDTargets.cmake")
-#endif()
-#
-#set(HCANA_LIBRARIES PODD::PODD)
diff --git a/cmake/hcanaConfig.cmake.in b/cmake/hcanaConfig.cmake.in
index e476f962b439585941fd58a79cb9fdc3711bf559..480c7a12cbe837ce8d9cb407337df67bfa1bb0d0 100644
--- a/cmake/hcanaConfig.cmake.in
+++ b/cmake/hcanaConfig.cmake.in
@@ -9,9 +9,16 @@ if(IS_DIRECTORY "@PACKAGE_INSTALL_CONFIGDIR@/Modules")
   list(APPEND CMAKE_MODULE_PATH "@PACKAGE_INSTALL_CONFIGDIR@/Modules")
 endif()
 
-@FIND_DEPENDENCY_COMMANDS@
-
 include("@PACKAGE_TARGETS_FILE@")
 
+@FIND_DEPENDENCY_COMMANDS@
+
 check_required_components(@PROJECT_NAME_UC@)
 
+## Extra rpath stuff for MacOS
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  set(CMAKE_INSTALL_RPATH 
+    ${CMAKE_INSTALL_RPATH} 
+    "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@")
+  message("hcana: set rpath to ${CMAKE_INSTALL_RPATH}")
+endif()
diff --git a/cmake/os.cmake b/cmake/os.cmake
index 14fc6762b7e6c94d656edc079d4b733399d9e8d5..2e8c979774a88056ece491d0ba5aee7c64a59d62 100644
--- a/cmake/os.cmake
+++ b/cmake/os.cmake
@@ -1,10 +1,8 @@
-## OSX/homebrew version of root6 installs its cmake macros in a non-standard
-## location. This might be an issue on other systems as well.
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} $ENV{ROOTSYS}/etc/root/cmake)
-endif()
-
-## Get rid of rpath warning on OSX
+## Set correct rpath on MacOs
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(CMAKE_MACOSX_RPATH 1)
+  set(CMAKE_INSTALL_RPATH
+    ${CMAKE_INSTALL_RPATH} 
+    "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+message("Setting RPath to ${CMAKE_INSTALL_RPATH}")
 endif()