diff --git a/cmake/GSettings.cmake b/cmake/GSettings.cmake
index df32e4fe..1438fd50 100644
--- a/cmake/GSettings.cmake
+++ b/cmake/GSettings.cmake
@@ -18,7 +18,7 @@ if (GSETTINGS_COMPILE_IN_PLACE)
 endif ()
 
 macro(add_schemas GSETTINGS_TARGET SCHEMA_DIRECTORY PREFIX)
-    set(PKG_CONFIG_EXECUTABLE pkg-config)
+    find_package(PkgConfig)
     
     # Locate all schema files.
     file(GLOB all_schema_files
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8bd572a0..0f1e7a19 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -602,7 +602,7 @@ add_custom_command(
     WORKING_DIRECTORY
         ${CMAKE_SOURCE_DIR}/bindings/metadata
     COMMAND
-        vapigen --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} `pkg-config --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir
+        vapigen --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} `${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir
 )
 
 # Geary client app