diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3937191c6c2ab4fa1b1c313fa1c9e85aaf9cf2f9..b640c2c792cf69d204c780eb6ffa326337baf2d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,7 +124,7 @@ set(CMAKE_MODULE_PATH
   ${CMAKE_MODULE_PATH} "${EXTRAS_DIR}/build/cmake/modules")
 find_package(LibJami REQUIRED)
 if(LIBJAMI_FOUND)
-  include_directories(${LIBJAMI_INCLUDE_DIR})
+  include_directories(${LIBJAMI_INCLUDE_DIRS})
 endif()
 
 include(FindPython3)
diff --git a/extras/build/cmake/modules/FindLibJami.cmake b/extras/build/cmake/modules/FindLibJami.cmake
index a263889e0ad52a1198271a942cdee05bc6066a81..1e271001ef2cdb8d5e9145ae5509476e3e5d5396 100644
--- a/extras/build/cmake/modules/FindLibJami.cmake
+++ b/extras/build/cmake/modules/FindLibJami.cmake
@@ -20,19 +20,28 @@
 
 # Once done, this find module will set:
 #
-#   LIBJAMI_INCLUDE_DIR - libjami include directories
+#   LIBJAMI_INCLUDE_DIRS - libjami include directories
 #   LIBJAMI_FOUND - whether it was able to find the include directories
 #   LIBJAMI_LIB - path to libjami or libring library
 
 set(LIBJAMI_FOUND true)
 
 if(WITH_DAEMON_SUBMODULE)
-  set(LIBJAMI_INCLUDE_DIR ${DAEMON_DIR}/src/jami)
+  set(LIBJAMI_INCLUDE_DIRS ${DAEMON_DIR}/src/jami)
 else()
-  find_path(LIBJAMI_INCLUDE_DIR jami.h PATH_SUFFIXES jami)
-  if(NOT LIBJAMI_INCLUDE_DIR)
+  if(EXISTS ${LIBJAMI_INCLUDE_DIR}/jami.h)
+    set(LIBJAMI_INCLUDE_DIRS ${LIBJAMI_INCLUDE_DIR})
+  elseif(EXISTS ${LIBJAMI_BUILD_DIR}/jami/jami.h)
+    set(LIBJAMI_INCLUDE_DIRS ${LIBJAMI_BUILD_DIR}/jami)
+  elseif(EXISTS ${RING_INCLUDE_DIR}/jami.h)
+    set(LIBJAMI_INCLUDE_DIRS ${RING_INCLUDE_DIR})
+  elseif(EXISTS ${RING_BUILD_DIR}/jami/jami.h)
+    set(LIBJAMI_INCLUDE_DIRS ${RING_BUILD_DIR}/jami)
+  elseif(EXISTS ${CMAKE_INSTALL_PREFIX}/include/jami/jami.h)
+    set(LIBJAMI_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include/jami)
+  else()
     message(STATUS "Jami daemon headers not found!
-Set -DCMAKE_INSTALL_PREFIX or use -DWITH_DAEMON_SUBMODULE")
+Set -DLIBJAMI_BUILD_DIR or -DCMAKE_INSTALL_PREFIX")
     set(LIBJAMI_FOUND false)
   endif()
 endif()
@@ -98,5 +107,5 @@ endif()
 # Restore the original value of CMAKE_FIND_LIBRARY_SUFFIXES.
 set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_orig})
 
-message(STATUS "Jami daemon headers are in " ${LIBJAMI_INCLUDE_DIR})
+message(STATUS "Jami daemon headers are in " ${LIBJAMI_INCLUDE_DIRS})
 message(STATUS "Jami daemon library is at " ${LIBJAMI_LIB})
diff --git a/src/libclient/CMakeLists.txt b/src/libclient/CMakeLists.txt
index c12dc113e3253dc4ca7c8bfa58a68cb8601aae37..4c0db810c86dafcd58cfa3a593b3a1c5d566cc71 100644
--- a/src/libclient/CMakeLists.txt
+++ b/src/libclient/CMakeLists.txt
@@ -62,7 +62,7 @@ set(CMAKE_MODULE_PATH
   ${CMAKE_MODULE_PATH} "${EXTRAS_DIR}/build/cmake/modules")
 find_package(LibJami REQUIRED)
 if(LIBJAMI_FOUND)
-  include_directories(${LIBJAMI_INCLUDE_DIR})
+  include_directories(${LIBJAMI_INCLUDE_DIRS})
 endif()
 
 string(SUBSTRING ${CMAKE_GENERATOR} 0 14 CMAKE_GENERATOR_SHORT)
diff --git a/src/libclient/qtwrapper/CMakeLists.txt b/src/libclient/qtwrapper/CMakeLists.txt
index ba68aac44d2b4573e5cc0690cde570b249bf1c11..acee0d0cdd3e1b2e5fb0caa6cd2fca7f0832f3aa 100644
--- a/src/libclient/qtwrapper/CMakeLists.txt
+++ b/src/libclient/qtwrapper/CMakeLists.txt
@@ -46,7 +46,7 @@ else()
 endif()
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${LIBJAMI_INCLUDE_DIR})
+include_directories(${LIBJAMI_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../dbus)