diff --git a/Findptu_d46.cmake b/Findptu_d46.cmake
index b1d8c33f358ffa107e97a3d7dbbf534b95f38177..71dfc6360db8ad9a5472cc9d5925849f05ed449b 100755
--- a/Findptu_d46.cmake
+++ b/Findptu_d46.cmake
@@ -1,9 +1,9 @@
 #edit the following line to add the librarie's header files
-FIND_PATH(ptu_d46_INCLUDE_DIRS ptu_commands.h ptu_d46.h ptu_d46_exceptions.h /usr/include/iri/ptu_d46 /usr/local/include/iri/ptu_d46)
+FIND_PATH(ptu_d46_INCLUDE_DIRS ptu_commands.h ptu_d46.h ptu_d46_exceptions.h /usr/include/iridrivers /usr/local/include/iri/ptu_d46 /usr/include/iri/ptu_d46)
 
 FIND_LIBRARY(ptu_d46_LIBRARIES
     NAMES ptu_d46
-    PATHS /usr/lib /usr/lib/iri/ptu_d46 /usr/local/lib /usr/local/lib/iri/ptu_d46)
+    PATHS /usr/local/lib/iridrivers /usr/local/lib/iri/ptu_d46 /usr/lib/iri/ptu_d46)
 
 SET(ptu_d46_INCLUDE_DIR ${ptu_d46_INCLUDE_DIRS})
 SET(ptu_d46_LIBRARY    ${ptu_d46_LIBRARIES})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 726fd68842e54a0a9ded9dab63935d39ad878dad..66874299013079fef6668a863dd411dd5cf31893 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,9 +12,9 @@ FIND_PACKAGE(trajectory REQUIRED)
 
 # edit the following line to add the necessary include directories
 INCLUDE_DIRECTORIES(. ../include)
-INCLUDE_DIRECTORIES(${iriutils_INCLUDE_DIR})
-INCLUDE_DIRECTORIES(${comm_INCLUDE_DIR})
-INCLUDE_DIRECTORIES(${trajectory_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${iriutils_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${comm_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${trajectory_INCLUDE_DIRS})
 
 SET_SOURCE_FILES_PROPERTIES(${XSD_SOURCES} PROPERTIES GENERATED 1)
 
@@ -23,10 +23,10 @@ ADD_LIBRARY(ptu_d46 SHARED ${sources} ${XSD_SOURCES})
 ADD_DEPENDENCIES(ptu_d46 xsd_files_gen)
 
 #edit the following line to add the necessary system libraries (if any)
-TARGET_LINK_LIBRARIES(ptu_d46 ${iriutils_LIBRARY})
-TARGET_LINK_LIBRARIES(ptu_d46 ${comm_LIBRARY})
-TARGET_LINK_LIBRARIES(ptu_d46 ${XSD_LIBRARY})
-TARGET_LINK_LIBRARIES(ptu_d46 ${trajectory_LIBRARY})
+TARGET_LINK_LIBRARIES(ptu_d46 ${iriutils_LIBRARIES})
+TARGET_LINK_LIBRARIES(ptu_d46 ${comm_LIBRARIES})
+TARGET_LINK_LIBRARIES(ptu_d46 ${XSD_LIBRARIES})
+TARGET_LINK_LIBRARIES(ptu_d46 ${trajectory_LIBRARIES})
 
 INSTALL(TARGETS ptu_d46
   RUNTIME DESTINATION bin
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index a98246a880a2f52506f429a4b3289d45d94fb5b4..af74ebb0982dbb8af41ed769057a9a8f16916a06 100755
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -4,14 +4,16 @@ IF(EXISTS "/usr/include/xsd/cxx")
    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_HAVE_XSD" PARENT_SCOPE)
    SET(XSD_FOUND TRUE) 
    MESSAGE(STATUS "Found the XML library ... adding support for XML files")
-   FIND_LIBRARY(XSD_LIBRARY
+   FIND_LIBRARY(XSD_LIBRARIES
       NAMES xerces-c
-      PATHS /usr/lib /usr/local/lib)
+      PATHS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu/)
+   SET(XSD_LIBRARY    ${XSD_LIBRARIES})
 ELSE(EXISTS "/usr/include/xsd/cxx")
    MESSAGE(STATUS "XML library not found ... it will be impossible to handle XML files")
 ENDIF(EXISTS "/usr/include/xsd/cxx")
 
 IF(XSD_FOUND)
+   SET(XSD_LIBRARIES ${XSD_LIBRARIES} PARENT_SCOPE)
    SET(XSD_LIBRARY ${XSD_LIBRARY} PARENT_SCOPE)
 
    SET(XSD_PATH ${CMAKE_CURRENT_SOURCE_DIR})