diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2838d20..b0d50cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,11 +13,34 @@ project(${PROJECT_NAME})
 option(WITH_ASAN ON)
 option(DISKHASH_TESTS ON)
 
-include(setup)
+set(CXX_FLAGS
+    CMAKE_CXX_FLAGS
+    CMAKE_CXX_FLAGS_DEBUG
+    CMAKE_CXX_FLAGS_MINSIZEREL
+    CMAKE_CXX_FLAGS_RELEASE
+    CMAKE_CXX_FLAGS_RELWITHDEBINFO
+)
 
 include_directories(${CMAKE_SOURCE_DIR}/src)
 add_library(diskhash STATIC src/os_wrappers.c src/diskhash.c)
 
+file(GLOB HDR_FILES ${CMAKE_SOURCE_DIR}/src/*.h*)
+set_target_properties(diskhash PROPERTIES PUBLIC_HEADER "${HDR_FILES}")
+
+install(TARGETS diskhash
+  EXPORT diskhashTargets
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+  RUNTIME DESTINATION bin
+  INCLUDES DESTINATION include
+  PUBLIC_HEADER DESTINATION include/diskhash
+)
+
+install(EXPORT diskhashTargets
+  FILE diskhashConfig.cmake
+  DESTINATION lib/cmake/diskhash
+)
+
 if(DISKHASH_TESTS)
   include_directories(${CMAKE_SOURCE_DIR}/unittests)
 
diff --git a/cmake-modules/setup.cmake b/cmake-modules/setup.cmake
deleted file mode 100644
index df02f34..0000000
--- a/cmake-modules/setup.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-set(CXX_FLAGS
-    CMAKE_CXX_FLAGS
-    CMAKE_CXX_FLAGS_DEBUG
-    CMAKE_CXX_FLAGS_MINSIZEREL
-    CMAKE_CXX_FLAGS_RELEASE
-    CMAKE_CXX_FLAGS_RELWITHDEBINFO
-)
-
-set(WITH_ASAN ON)
-set(DISKHASH_TESTS ON)
diff --git a/src/diskhash_iterator.hpp b/src/diskhash_iterator.hpp
index c5555f8..7b1e16a 100644
--- a/src/diskhash_iterator.hpp
+++ b/src/diskhash_iterator.hpp
@@ -8,6 +8,7 @@
 #include <utility>
 #include <algorithm>
 #include <memory>
+#include <limits>
 
 namespace dht {
 
@@ -114,6 +115,7 @@ struct DiskHash<T>::iterator {
         }
         // There is no other available return for dht_indexed_lookup ().
         assert (false);
+        return 0;
     }
 };