diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3794dbcb..cf85cc43 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,13 +52,7 @@ LIST (APPEND msgpack_SOURCES
 	src/zone.c
 )
 
-LIST (APPEND msgpack_root_HEADERS
-	src/msgpack.h
-)
-
-LIST (APPEND msgpack_HEADERS ${msgpack_root_HEADERS})
-
-LIST (APPEND msgpack_msgpack_HEADERS
+LIST (APPEND msgpack_HEADERS
 	src/msgpack/pack_define.h
 	src/msgpack/pack_template.h
 	src/msgpack/unpack_define.h
@@ -74,15 +68,9 @@ LIST (APPEND msgpack_msgpack_HEADERS
 	src/msgpack/zone.h
 )
 
-LIST (APPEND msgpack_HEADERS ${msgpack_msgpack_HEADERS})
-
 IF (MSGPACK_ENABLE_CXX)
-	LIST (APPEND msgpack_root_HEADERS
+	LIST (APPEND msgpack_HEADERS
 		src/msgpack.hpp
-	)
-	LIST (APPEND msgpack_HEADERS ${msgpack_root_HEADERS})
-
-	LIST (APPEND msgpack_msgpack_HEADERS
 		src/msgpack/sbuffer.hpp
 		src/msgpack/vrefbuffer.hpp
 		src/msgpack/zbuffer.hpp
@@ -90,10 +78,6 @@ IF (MSGPACK_ENABLE_CXX)
 		src/msgpack/unpack.hpp
 		src/msgpack/object.hpp
 		src/msgpack/zone.hpp
-	)
-	LIST (APPEND msgpack_HEADERS ${msgpack_msgpack_HEADERS})
-
-	LIST (APPEND msgpack_type_HEADERS
 		src/msgpack/type.hpp
 		src/msgpack/type/bool.hpp
 		src/msgpack/type/deque.hpp
@@ -110,14 +94,9 @@ IF (MSGPACK_ENABLE_CXX)
 		src/msgpack/type/vector.hpp
 		src/msgpack/type/tuple.hpp
 		src/msgpack/type/define.hpp
-	)
-	LIST (APPEND msgpack_HEADERS ${msgpack_type_HEADERS})
-
-	LIST (APPEND msgpack_tr1_HEADERS
 		src/msgpack/type/tr1/unordered_map.hpp
 		src/msgpack/type/tr1/unordered_set.hpp
 	)
-	LIST (APPEND msgpack_HEADERS ${msgpack_tr1_HEADERS})
 ENDIF ()
 
 IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
@@ -167,10 +146,8 @@ IF (MSGPACK_BUILD_TESTS)
 ENDIF ()
 
 INSTALL (TARGETS msgpack msgpack-static DESTINATION lib)
-INSTALL (FILES ${msgpack_root_HEADERS} DESTINATION include)
-INSTALL (FILES ${msgpack_msgpack_HEADERS} DESTINATION include/msgpack)
-INSTALL (FILES ${msgpack_type_HEADERS} DESTINATION include/msgpack/type)
-INSTALL (FILES ${msgpack_tr1_HEADERS} DESTINATION include/msgpack/type/tr1)
+INSTALL (DIRECTORY src/msgpack DESTINATION include)
+INSTALL (FILES src/msgpack.h src/msgpack.hpp DESTINATION include)
 INSTALL (FILES msgpack.pc DESTINATION lib/pkgconfig)
 
 # Doxygen