diff --git a/fastlib/branches/fastlib-cmake/CMakeLists.txt b/fastlib/branches/fastlib-cmake/CMakeLists.txt
index a3746a8990..7e2a7cff31 100644
--- a/fastlib/branches/fastlib-cmake/CMakeLists.txt
+++ b/fastlib/branches/fastlib-cmake/CMakeLists.txt
@@ -15,7 +15,7 @@ include( CMake/TargetDistclean.cmake OPTIONAL )
 ## Global compiler flags (dep. on platform TODO)
 add_definitions( -DDISABLE_DISK_MATRIX )
 
-include_directories( ${FASTLIB_INCLUDE_DIRS} )
+#include_directories( ${FASTLIB_INCLUDE_DIRS} )
 include_directories(${CMAKE_BINARY_DIR}/include/)
 #TODO link_directories()
 
diff --git a/fastlib/branches/fastlib-cmake/mlpack/CMakeLists.txt b/fastlib/branches/fastlib-cmake/mlpack/CMakeLists.txt
index b92c27cd9d..7ebbde8eb5 100644
--- a/fastlib/branches/fastlib-cmake/mlpack/CMakeLists.txt
+++ b/fastlib/branches/fastlib-cmake/mlpack/CMakeLists.txt
@@ -72,6 +72,14 @@ foreach(incl_file ${INCLUDE_FILES})
       COMMAND ${CMAKE_COMMAND} ARGS -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${incl_file} ${CMAKE_BINARY_DIR}/include/mlpack/${incl_file} )
 endforeach()
 
+# set installation rules for include files
+install(FILES ${CMAKE_BINARY_DIR}/include/mlpack/
+   DESTINATION include/mlpack)
+
+# set installation rules for mlpack programs
+install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/
+   DESTINATION bin)
+
 install(TARGETS mlpack
    RUNTIME DESTINATION bin
    LIBRARY DESTINATION lib
diff --git a/fastlib/branches/fastlib-cmake/src/CMakeLists.txt b/fastlib/branches/fastlib-cmake/src/CMakeLists.txt
index eea50cd9cd..b4ca5b09a7 100644
--- a/fastlib/branches/fastlib-cmake/src/CMakeLists.txt
+++ b/fastlib/branches/fastlib-cmake/src/CMakeLists.txt
@@ -65,6 +65,10 @@ endforeach()
 add_executable( otrav_test otrav_test.cc )
 target_link_libraries( otrav_test fastlib )
 
+# make sure header files are installed correctly
+install(FILES ${CMAKE_BINARY_DIR}/include/fastlib/
+   DESTINATION include/fastlib)
+
 ## installation
 install(TARGETS fastlib 
     RUNTIME DESTINATION bin