diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92636cffa98b47805a7661f14574f7e05d9e840e..656143f65c27432594686217fadc947dcd5cbca7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,10 +2,6 @@
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
-INCLUDE(cmake/base.cmake)
-INCLUDE(cmake/boost.cmake)
-INCLUDE(cmake/eigen.cmake)
-INCLUDE(cmake/pthread.cmake)
 
 SET(PROJECT_ORG stack-of-tasks)
 SET(PROJECT_NAME dynamic-graph)
@@ -13,6 +9,16 @@ SET(PROJECT_DESCRIPTION "Dynamic graph library")
 SET(PROJECT_URL "http://github.com/${PROJECT_ORG}/${PROJECT_NAME}")
 SET(PROJECT_SUFFIX "-v3")
 
+INCLUDE(cmake/base.cmake)
+PROJECT(${PROJECT_NAME} CXX)
+
+INCLUDE(cmake/boost.cmake)
+INCLUDE(cmake/eigen.cmake)
+INCLUDE(cmake/pthread.cmake)
+
+# Export CMake Target
+SET(PROJECT_USE_CMAKE_EXPORT TRUE)
+
 SET(CUSTOM_HEADER_DIR "${PROJECT_NAME}")
 
 SET(DOXYGEN_USE_MATHJAX YES)
@@ -20,8 +26,6 @@ SET(DOXYGEN_USE_MATHJAX YES)
 # Defines paths.
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
 
-SETUP_PROJECT()
-
 # Add configuration headers for plug-ins.
 GENERATE_CONFIGURATION_HEADER(
   ${HEADER_DIR} config-tracer.hh DG_TRACER tracer_EXPORTS)
@@ -53,3 +57,4 @@ ADD_SUBDIRECTORY(include/${PROJECT_NAME})
 ADD_SUBDIRECTORY(tests)
 
 SETUP_PROJECT_FINALIZE()
+SETUP_PROJECT_PACKAGE_FINALIZE()
diff --git a/include/dynamic-graph/CMakeLists.txt b/include/dynamic-graph/CMakeLists.txt
index 820ce9724efbf5e0505eaea75c13fd48be1e920d..7baf760d81b0505433c6d8566badcc10982abce5 100644
--- a/include/dynamic-graph/CMakeLists.txt
+++ b/include/dynamic-graph/CMakeLists.txt
@@ -50,6 +50,6 @@ SET(${PROJECT_NAME}_HEADERS
   logger.h
     )
 
-INSTALL(FILES ${${PROJECT_NAME}_HEADERS}
-  DESTINATION include/${PROJECT_NAME}
+  INSTALL(FILES ${${PROJECT_NAME}_HEADERS}
+    DESTINATION include/${PROJECT_NAME}
   )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a4fedf459c5fddc3fe2247325af970cc3eb6a95a..5e7082817a27ed441e1beb9494b15e8f6ae55ea7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -54,6 +54,7 @@ TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${Boost_LIBRARIES})
 #ENDIF (UNIX AND NOT APPLE)
 
 INSTALL(TARGETS ${LIBRARY_NAME}
+  EXPORT ${TARGETS_EXPORT_NAME}
   DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 ####################################
@@ -79,5 +80,5 @@ FOREACH(plugin_file ${plugins_list})
     PREFIX ""
     )
 
-  INSTALL(TARGETS ${plugin} DESTINATION ${PLUGINDIR})
+  INSTALL(TARGETS ${plugin} EXPORT ${TARGET_NAME} DESTINATION ${PLUGINDIR})
 ENDFOREACH(plugin_file)