diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74d66c0c..e40ab481 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,6 @@ option(SKIP_PYBIND11
 
 # Python interfaces vars
 include(CMakeDependentOption)
-include(GzPython)
 cmake_dependent_option(USE_SYSTEM_PATHS_FOR_PYTHON_INSTALLATION
       "Install python modules in standard system paths in the system"
       OFF "NOT SKIP_PYBIND11" OFF)
@@ -53,6 +52,28 @@ endif()
 #============================================================================
 message(STATUS "\n\n-- ====== Finding Dependencies ======")
 
+#--------------------------------------
+# Python interfaces
+if (SKIP_PYBIND11)
+  message(STATUS "SKIP_PYBIND11 set - disabling python bindings")
+  find_package(Python3 COMPONENTS Interpreter)
+else()
+  find_package(Python3 COMPONENTS Interpreter Development)
+  if (NOT Python3_Development_FOUND)
+    GZ_BUILD_WARNING("Python development libraries are missing: Python interfaces are disabled.")
+  else()
+    set(PYBIND11_PYTHON_VERSION 3)
+    find_package(pybind11 2.4 CONFIG QUIET)
+
+    if (pybind11_FOUND)
+      message (STATUS "Searching for pybind11 - found version ${pybind11_VERSION}.")
+    else()
+      GZ_BUILD_WARNING("pybind11 is missing: Python interfaces are disabled.")
+      message (STATUS "Searching for pybind11 - not found.")
+    endif()
+  endif()
+endif()
+
 #--------------------------------------
 # Find Protobuf
 gz_find_package(GzProtobuf
@@ -132,31 +153,6 @@ gz_find_package(SQLite3
 #============================================================================
 # Configure the build
 #============================================================================
-
-########################################
-# Python interfaces
-if (NOT PYTHON3_FOUND)
-  GZ_BUILD_WARNING("Python is missing: Python interfaces are disabled.")
-  message (STATUS "Searching for Python - not found.")
-else()
-  message (STATUS "Searching for Python - found version ${Python3_VERSION}.")
-
-  if (SKIP_PYBIND11)
-    message(STATUS "SKIP_PYBIND11 set - disabling python bindings")
-  else()
-    set(PYBIND11_PYTHON_VERSION 3)
-    find_package(pybind11 2.4 QUIET)
-
-    if (${pybind11_FOUND})
-      find_package(Python3 ${GZ_PYTHON_VERSION} REQUIRED COMPONENTS Development)
-      message (STATUS "Searching for pybind11 - found version ${pybind11_VERSION}.")
-    else()
-      GZ_BUILD_WARNING("pybind11 is missing: Python interfaces are disabled.")
-      message (STATUS "Searching for pybind11 - not found.")
-    endif()
-  endif()
-endif()
-
 gz_configure_build(QUIT_IF_BUILD_ERRORS
   COMPONENTS log parameters)