diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7de92cc2..4b8cef3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,7 @@ install(PROGRAMS "src/extern/binvox/binvox64" DESTINATION bin)
 install(PROGRAMS "src/extern/binvox/viewvox" DESTINATION bin)
 install(PROGRAMS "src/extern/binvox/viewvox64" DESTINATION bin)
 
-file(GLOB octomap_HDRS ${CMAKE_SOURCE_DIR}/include/octomap/*.h)
+file(GLOB octomap_HDRS ${CMAKE_SOURCE_DIR}/include/octomap/*.h ${CMAKE_SOURCE_DIR}/include/octomap/*.hxx)
 install(FILES ${octomap_HDRS}	DESTINATION include/octomap)
 file(GLOB octomap_math_HDRS ${CMAKE_SOURCE_DIR}/include/octomap/math/*.h)
 install(FILES ${octomap_math_HDRS}	DESTINATION include/octomap/math)
diff --git a/src/octomap/CMakeLists.txt b/src/octomap/CMakeLists.txt
index 87f3d86e..3445e464 100644
--- a/src/octomap/CMakeLists.txt
+++ b/src/octomap/CMakeLists.txt
@@ -43,8 +43,8 @@ TARGET_LINK_LIBRARIES(test_raycasting octomap)
 
 # installation:
 # store all header files to install:
-file(GLOB octomap_impl_HDRS *.h *.hxx *.hpp)
-install(FILES ${octomap_impl_HDRS} DESTINATION include/octomap)
+# file(GLOB octomap_impl_HDRS *.h *.hxx *.hpp)
+# install(FILES ${octomap_impl_HDRS} DESTINATION include/octomap)
 
 install(TARGETS octomap 
 	graph2tree