diff --git a/Findcomm.cmake b/Findcomm.cmake
index deab1a931b0feef46b2c088e6d0bb2f9776d4f11..47100b97637377cba9b1c960ab4e5f0fddd56f58 100644
--- a/Findcomm.cmake
+++ b/Findcomm.cmake
@@ -1,9 +1,9 @@
-FIND_PATH(comm_INCLUDE_DIR comm.h commexceptions.h rs232.h rs232exceptions.h ftdiserver.h ftdimodule.h ftdiexcetpions.h socket.h socketclient.h socketserver.h socketexceptions.h /usr/include/iridrivers /usr/local/include/iridrivers)
+FIND_PATH(comm_INCLUDE_DIR comm.h commexceptions.h rs232.h rs232exceptions.h ftdiserver.h ftdimodule.h ftdiexcetpions.h socket.h socketclient.h socketserver.h socketexceptions.h /usr/include/iri/comm /usr/local/include/iri/comm)
 
 
 FIND_LIBRARY(comm_LIBRARY
     NAMES comm
-    PATHS /usr/lib/iridrivers /usr/local/lib /usr/local/lib/iridrivers) 
+    PATHS /usr/lib/iri/comm /usr/local/lib /usr/local/lib/iri/comm) 
 
 IF (comm_INCLUDE_DIR AND comm_LIBRARY)
    SET(comm_FOUND TRUE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c7170126dadc40f0730388f7f18c69abdb71553a..f8a0546d84aed06be915c57ba6bedcd0c8c8bb15 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -70,11 +70,11 @@ ENDIF(BUILD_FTDI)
 
 INSTALL(TARGETS comm
   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 ../Findcomm.cmake DESTINATION ${CMAKE_ROOT}/Modules/)