diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6004d6f..8b09567 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,9 +28,9 @@ endif()
 install(FILES src/parser_global.h   DESTINATION include/Parser)
 install(FILES src/Parser.h   DESTINATION include/Parser)
 install(DIRECTORY src/ShotList/ DESTINATION include/Parser/ShotList FILES_MATCHING PATTERN "ShotList.h")
-install(DIRECTORY src/MatLab/ DESTINATION include/Parser/MatLab FILES_MATCHING PATTERN "*r.h")
+install(DIRECTORY src/MatLab/ DESTINATION include/Parser/MatLab FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY src/Data/ DESTINATION include/Parser/Data FILES_MATCHING PATTERN "*.h")
-install(FILES cmake/ParserConfig.cmake  DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(FILES cmake/ParserConfig.cmake  DESTINATION ${CMAKE_INSTALL_PREFIX}/cmake)
 install(FILES thirdParty/lib/libmatio.so DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/ RENAME libmatio.so.11)
 install(FILES thirdParty/lib/libsqlite3.so DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/ RENAME libsqlite3.so.0)
 install(TARGETS Parser RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/cmake/ParserConfig.cmake b/cmake/ParserConfig.cmake
index 3c69e54..3b3f514 100644
--- a/cmake/ParserConfig.cmake
+++ b/cmake/ParserConfig.cmake
@@ -2,7 +2,8 @@ set(Parser_MAJOR_VERSION 1)
 set(Parser_MINOR_VERSION 0)
 set(Parser_BUILD_VERSION 0)
 
-set(Parser_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/include/" "${CMAKE_CURRENT_LIST_DIR}/include/Parser/")
+get_filename_component(Parser_DIR "${CMAKE_CURRENT_LIST_DIR}/" PATH)
+set(Parser_INCLUDE_DIRS "${Parser_DIR}/include/" "${Parser_DIR}/include/Parser/")
 add_library(Parser SHARED IMPORTED)
 set_target_properties(Parser PROPERTIES IMPORTED_LOCATION "${Parser_DIR}/lib/libParser.so")
 add_library(sqlite3 SHARED IMPORTED)