diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51757934bc6..c42a9532ba3 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -331,6 +331,6 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
         COMPONENT Development)
 
 install(FILES "cmake/modules/FindLibCrypto.cmake"
-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/"
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/modules/"
         COMPONENT Development)
 
diff --git a/cmake/s2n-config.cmake b/cmake/s2n-config.cmake
index e512dd4255f..09d1c3aa75c 100644
--- a/cmake/s2n-config.cmake
+++ b/cmake/s2n-config.cmake
@@ -5,6 +5,7 @@ if (NOT MSVC)
     find_package(Threads REQUIRED)
 endif()
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules")
 find_dependency(LibCrypto)
 
 if (BUILD_SHARED_LIBS)