diff --git a/cmake/AIDAConfig.cmake.in b/cmake/AIDAConfig.cmake.in
index 3849fbc..fb9687b 100644
--- a/cmake/AIDAConfig.cmake.in
+++ b/cmake/AIDAConfig.cmake.in
@@ -3,7 +3,11 @@
 # @author Jan Engels, Desy
 ##############################################################################
 
-INCLUDE( "@CMAKE_INSTALL_PREFIX@/RAIDAConfig.cmake" )
+
+INCLUDE( "@CMAKE_INSTALL_PREFIX@/lib/cmake/RAIDA/RAIDAConfig.cmake" OPTIONAL RESULT_VARIABLE RAIDA_CONFIG_INCLUDED )
+IF( RAIDA_CONFIG_INCLUDED STREQUAL "NOTFOUND" )
+  INCLUDE( "@CMAKE_INSTALL_PREFIX@/RAIDAConfig.cmake" )
+ENDIF()
 
 SET( AIDA_FOUND ${RAIDA_FOUND} )
 
diff --git a/cmake/RAIDAConfig.cmake.in b/cmake/RAIDAConfig.cmake.in
index e86c549..9150b23 100644
--- a/cmake/RAIDAConfig.cmake.in
+++ b/cmake/RAIDAConfig.cmake.in
@@ -53,7 +53,10 @@ CHECK_PACKAGE_LIBS( RAIDA RAIDA )
 
 # ---------- libraries dependencies -------------------------------------------
 # this sets RAIDA_${COMPONENT}_LIB_DEPENDS variables
-INCLUDE( "${RAIDA_ROOT}/lib/cmake/RAIDALibDeps.cmake" )
+INCLUDE( "${RAIDA_ROOT}/lib/cmake/RAIDA/RAIDALibDeps.cmake" OPTIONAL RESULT_VARIABLE RAIDA_LIBDEPS_INCLUDED )
+IF( RAIDA_LIBDEPS_INCLUDED STREQUAL "NOTFOUND" )
+    INCLUDE( "${RAIDA_ROOT}/lib/cmake/RAIDALibDeps.cmake" )
+ENDIF()