diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef7bb19af..6a4db8e44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -308,9 +308,9 @@ endif()
 
 if(USE_PROJ)
     #https://proj.org/development/cmake.html
-    mapnik_find_package(PROJ QUIET)
+    mapnik_find_package(PROJ4 QUIET)
     # currently the cmake files are not installed, when installing proj via apt-get. So search via pkg-config
-    if(NOT PROJ_FOUND)
+    if(NOT PROJ4_FOUND)
         message(STATUS "PROJ not found via FindPROJ. Searching via pkg-config...")
         pkg_check_modules(PROJ REQUIRED IMPORTED_TARGET proj)
         string(REGEX MATCH "([0-9]+)\.([0-9]+)\.([0-9]+)" _dummy "${PROJ_VERSION}")
@@ -318,11 +318,11 @@ if(USE_PROJ)
         set(PROJ_VERSION_MINOR "${CMAKE_MATCH_2}")
         set(PROJ_VERSION_PATCH "${CMAKE_MATCH_3}")
     endif()
-    math(EXPR MAPNIK_PROJ_VERSION "${PROJ_VERSION_MAJOR}*10000 + ${PROJ_VERSION_MINOR}*100 + ${PROJ_VERSION_PATCH}" OUTPUT_FORMAT DECIMAL)
+    math(EXPR MAPNIK_PROJ_VERSION "${PROJ4_VERSION_MAJOR}*10000 + ${PROJ4_VERSION_MINOR}*100 + ${PROJ4_VERSION_PATCH}" OUTPUT_FORMAT DECIMAL)
     message(STATUS "Using mapnik PROJ version: ${MAPNIK_PROJ_VERSION}")
     list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_USE_PROJ MAPNIK_PROJ_VERSION=${MAPNIK_PROJ_VERSION})
-    list(APPEND MAPNIK_OPTIONAL_LIBS ${PROJ_LIBRARIES})
-    list(APPEND MAPNIK_OPTIONAL_LIBS_INCLUDE ${PROJ_INCLUDE_DIRS})
+    list(APPEND MAPNIK_OPTIONAL_LIBS ${PROJ4_LIBRARIES})
+    list(APPEND MAPNIK_OPTIONAL_LIBS_INCLUDE ${PROJ4_INCLUDE_DIRS})
 endif()
 
 if(USE_GRID_RENDERER)
diff --git a/cmake/FindWebP.cmake b/cmake/FindWebP.cmake
index e966a0cf8..57c9e94e9 100644
--- a/cmake/FindWebP.cmake
+++ b/cmake/FindWebP.cmake
@@ -63,8 +63,7 @@ if ("${WebP_FIND_VERSION}" VERSION_GREATER "${WebP_VERSION}")
 endif ()
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(WebP 
-  FOUND_VAR WebP_FOUND
+find_package_handle_standard_args(WebP
   REQUIRED_VARS 
     WebP_LIBRARY
     WebP_INCLUDE_DIR