diff --git a/cmake/Modules/FindITPP.cmake b/cmake/Modules/FindITPP.cmake
index 340822d..909f95a 100644
--- a/cmake/Modules/FindITPP.cmake
+++ b/cmake/Modules/FindITPP.cmake
@@ -12,8 +12,10 @@ pkg_check_modules(PC_ITPP itpp)
 
 find_path(ITPP_INCLUDE_DIR
   NAMES itpp/itbase.h
-  HINTS ${PC_ITPP_INCLUDEDIR}/include
+  HINTS ${PC_ITPP_INCLUDEDIR}
+  ${PC_ITPP_INCLUDEDIR}/include
   ${ITPP_DIR}/include
+  PATHS
   /usr/pkgs64/include
   /usr/include
   /usr/local/include
@@ -40,11 +42,11 @@ find_library(ITPP_LIBRARY_DEBUG
 )
 
 if (ITPP_LIBRARY_NORMAL OR ITPP_LIBRARY_DEBUG)
-  if (CMAKE_BUILD_TYPE STREQUAL "Debug" AND ITPP_LIBRARY_DEBUG)
+  if ((CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") AND ITPP_LIBRARY_DEBUG)
     SET (ITPP_LIBRARY ${ITPP_LIBRARY_DEBUG})
-  else (CMAKE_BUILD_TYPE STREQUAL "Debug" AND ITPP_LIBRARY_DEBUG)
+  else ((CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") AND ITPP_LIBRARY_DEBUG)
     SET (ITPP_LIBRARY ${ITPP_LIBRARY_NORMAL})
-  endif (CMAKE_BUILD_TYPE STREQUAL "Debug" AND ITPP_LIBRARY_DEBUG)
+  endif ((CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") AND ITPP_LIBRARY_DEBUG)
 endif (ITPP_LIBRARY_NORMAL OR ITPP_LIBRARY_DEBUG)
 
 if (ITPP_LIBRARY AND ITPP_INCLUDE_DIR)