diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4d7f80..48bef3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,8 +97,8 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/cadmesh-config.cmake.in" "${CM
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cadmesh-config.cmake" DESTINATION "lib/cmake/cadmesh-${CADMESH_MAJOR_VERSION}.${CADMESH_MINOR_VERSION}.${CADMESH_PATCH_VERSION}")
 
 # Install the CADMesh headers and library.
-install(FILES ${PROJECT_SOURCE_DIR}/include/CADMesh.hh DESTINATION include)
-install(FILES ${PROJECT_BINARY_DIR}/include/Configuration.hh DESTINATION include)
+install(FILES ${headers} DESTINATION include/CADMesh)
+install(FILES ${PROJECT_BINARY_DIR}/include/Configuration.hh DESTINATION include/CADMesh)
 install(TARGETS cadmesh DESTINATION lib)
 
 # Set CPack to build an archive.
diff --git a/cmake/cadmesh-config.cmake.in b/cmake/cadmesh-config.cmake.in
index ba85a0b..85ba420 100644
--- a/cmake/cadmesh-config.cmake.in
+++ b/cmake/cadmesh-config.cmake.in
@@ -1,4 +1,4 @@
 
-set(CADMESH_INCLUDE_DIRS @CMAKE_INSTALL_PREFIX@/include)
+set(CADMESH_INCLUDE_DIRS @CMAKE_INSTALL_PREFIX@/include/CADMesh)
 set(cadmesh_LIBRARIES -L@CMAKE_INSTALL_PREFIX@/lib cadmesh assimp tet)