diff --git a/Findiriutils.cmake b/Findiriutils.cmake
index 3d62f89d6c41389139fdf6a288c58116f795e5af..68c6ef0b5adda59533171842e7d4b8a53714cacc 100644
--- a/Findiriutils.cmake
+++ b/Findiriutils.cmake
@@ -1,8 +1,8 @@
-FIND_PATH(iriutils_INCLUDE_DIR exceptions.h mutex.h mutexexceptions.h event.h eventserver.h eventexceptions.h thread.h threadserver.h threadexceptions.h comm.h commexceptions.h log.h logexceptions.h /usr/include/iridrivers /usr/local/include/iridrivers)
+FIND_PATH(iriutils_INCLUDE_DIR exceptions.h mutex.h mutexexceptions.h event.h eventserver.h eventexceptions.h thread.h threadserver.h threadexceptions.h comm.h commexceptions.h log.h logexceptions.h /usr/include/iri/iriutils /usr/local/include/iri/iriutils)
 
 FIND_LIBRARY(iriutils_LIBRARY
     NAMES iriutils
-    PATHS /usr/lib/iridrivers /usr/local/lib /usr/local/lib/iridrivers) 
+    PATHS /usr/lib/iri/iriutils /usr/local/lib /usr/local/lib/iri/iriutils) 
 
 IF (iriutils_INCLUDE_DIR AND iriutils_LIBRARY)
    SET(iriutils_FOUND TRUE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7d8b71cb2cbe4a90ad337da2fc8935ff196642c5..d1be0c58426d11d394a07f11ccada12e299b2ba9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,11 +20,11 @@ ENDIF(APPLE)
 
 INSTALL(TARGETS iriutils
   RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib/iridrivers
-  ARCHIVE DESTINATION lib/iridrivers
+  LIBRARY DESTINATION lib/iri/${PROJECT_NAME}
+  ARCHIVE DESTINATION lib/iri/${PROJECT_NAME}
 )
 
-INSTALL(FILES ${headers} DESTINATION include/iridrivers)
+INSTALL(FILES ${headers} DESTINATION include/iri/${PROJECT_NAME})
 
 INSTALL(FILES ../Findiriutils.cmake DESTINATION ${CMAKE_ROOT}/Modules/)