diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2af9c7..b5b999b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,6 +29,11 @@ configure_package_config_file(
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnunetppConfig.cmake
     DESTINATION lib/cmake/gnunetpp)
 install(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindGNUnet.cmake
     ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Findidn.cmake
     DESTINATION lib/cmake/gnunetpp)
+install(FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindGNUnet.cmake
+    DESTINATION lib/cmake/GNUnet)
+install(FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Findidn.cmake
+    DESTINATION lib/cmake/idn)
diff --git a/gnunetpp/gnunetpp-peerinfo.cpp b/gnunetpp/gnunetpp-peerinfo.cpp
index d4e1b02..ea0606f 100644
--- a/gnunetpp/gnunetpp-peerinfo.cpp
+++ b/gnunetpp/gnunetpp-peerinfo.cpp
@@ -1,6 +1,7 @@
 #include "gnunetpp-peerinfo.hpp"
 #include "gnunetpp-crypto.hpp"
 #include <iostream>
+#include <iomanip>
 
 using namespace gnunetpp;
 
diff --git a/gnunetppConfig.cmake.in b/gnunetppConfig.cmake.in
index e0e2e2a..ec375a4 100644
--- a/gnunetppConfig.cmake.in
+++ b/gnunetppConfig.cmake.in
@@ -20,7 +20,10 @@ add_library(@PROJECT_NAME@::@PROJECT_NAME@ INTERFACE IMPORTED)
 set_target_properties(@PROJECT_NAME@::@PROJECT_NAME@ PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_INSTALL_INCLUDEDIR}")
 
 # Find dependencies
+set(MODULE_PATH_BACKUP ${CMAKE_MODULE_PATH})
+set(CMAKE_MODULE_PATH @CMAKE_INSTALL_PREFIX@/lib/cmake/idn @CMAKE_INSTALL_PREFIX@/lib/cmake/gnunet @CMAKE_INSTALL_PREFIX@/lib/cmake/GNUnet ${CMAKE_MODULE_PATH})
 find_package(GNUnet REQUIRED)
+set(CMAKE_MODULE_PATH ${MODULE_PATH_BACKUP})
 
 target_link_libraries(@PROJECT_NAME@::@PROJECT_NAME@ INTERFACE
     @PROJECT_NAME@