 -find_package(Boost 1.48 COMPONENTS system date_time thread chrono regex random REQUIRED)
 -find_package(ZeroMQ 4.0 REQUIRED)
 +if(DEFINED CMAKE_MODULE_PATH)
-+  set(XP_MODULE_PATH ${CMAKE_MODULE_PATH})
-+  xpFindPkg(PKGS boost libzmq)
-+  set(Boost_LIBRARIES Boost::regex Boost::system)
-+  set(ZeroMQ_LIBRARIES xpro::libzmq-static)
++    set(XP_MODULE_PATH ${CMAKE_MODULE_PATH})
++    xpFindPkg(PKGS boost libzmq)
++    set(Boost_LIBRARIES Boost::regex Boost::system Boost::thread)
++    set(ZeroMQ_LIBRARIES xpro::libzmq-static)
 +else()
-+  set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/config")
-+  find_package(Boost 1.48 COMPONENTS system date_time thread chrono regex random REQUIRED)
-+  find_package(ZeroMQ 4.0 REQUIRED)
++    set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/config")
++    find_package(Boost 1.48 COMPONENTS system date_time thread chrono regex random REQUIRED)
++    find_package(ZeroMQ 4.0 REQUIRED)
 +endif()
  
  set(CMAKE_THREAD_PREFER_PTHREAD TRUE)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 762fa31..22012e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.8)

+target_link_libraries(${PROJECT_NAME} INTERFACE ${Boost_LIBRARIES} ${ZeroMQ_LIBRARIES})
+install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-targets)
+if(DEFINED XP_NAMESPACE)
+    set(nameSpace NAMESPACE ${XP_NAMESPACE}::)
+endif()
+if(NOT DEFINED AZMQ_CMAKECONFIG_INSTALL_DIR)
+    set(AZMQ_CMAKECONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake)
+endif()
+install(EXPORT ${PROJECT_NAME}-targets ${nameSpace} DESTINATION ${AZMQ_CMAKECONFIG_INSTALL_DIR})
+
