diff --git a/cmake/FindSodium.cmake b/cmake/FindSodium.cmake
index 54862cb91..38aa46f76 100644
--- a/cmake/FindSodium.cmake
+++ b/cmake/FindSodium.cmake
@@ -51,7 +51,7 @@ if (UNIX)
     # import pkg-config
     find_package(PkgConfig QUIET)
     if (PKG_CONFIG_FOUND)
-        pkg_check_modules(sodium_PKG QUIET libsodium>=${PACKAGE_FIND_VERSION})
+        pkg_check_modules(sodium_PKG QUIET libsodium>=${Sodium_FIND_VERSION})
     endif()
 
     if(sodium_USE_STATIC_LIBS)
@@ -213,8 +213,8 @@ endif()
 
 # extract sodium version
 if (sodium_INCLUDE_DIR)
-    set(_VERSION_HEADER "${_INCLUDE_DIR}/sodium/version.h")
-    if (EXISTS _VERSION_HEADER)
+    set(_VERSION_HEADER "${sodium_INCLUDE_DIR}/sodium/version.h")
+    if (EXISTS "${_VERSION_HEADER}")
         file(READ "${_VERSION_HEADER}" _VERSION_HEADER_CONTENT)
         string(REGEX REPLACE ".*#[ \t]*define[ \t]*SODIUM_VERSION_STRING[ \t]*\"([^\n]*)\".*" "\\1"
             sodium_VERSION "${_VERSION_HEADER_CONTENT}")
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 7ff32fd68..67b66b4c4 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -48,6 +48,7 @@ if(NOT VENDOR_LIBSODIUM)
   find_package(Sodium 1.0.16)
   if(NOT sodium_FOUND)
     set(VENDOR_LIBSODIUM ON)
+    message(STATUS "Could not find libsodium >= 1.0.16, using vendored copy")
   endif()
 endif()