--- cmake/modules/FindPython3.cmake.orig
+++ cmake/modules/FindPython3.cmake
@@ -39,19 +39,13 @@
 
 include (FindPackageHandleStandardArgs)
 
-find_path (PYTHON3_INCLUDE_DIR NAMES Python.h)
-find_library (PYTHON3_LIBRARY NAMES python3)
+find_package(PythonInterp) # provides Python major/minor version vars
+find_package(PythonLibs)
 
-# Handle the QUIETLY and REQUIRED arguments and set PYTHON3_FOUND.
-find_package_handle_standard_args (PYTHON3 DEFAULT_MSG
-    PYTHON3_INCLUDE_DIR
-    PYTHON3_LIBRARY
-)
-
 # Set the output variables.
-if (PYTHON3_FOUND)
-    set (PYTHON3_INCLUDE_DIRS ${PYTHON3_INCLUDE_DIR})
-    set (PYTHON3_LIBRARIES ${PYTHON3_LIBRARY})
+if (PYTHONLIBS_FOUND)
+    set (PYTHON3_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
+    set (PYTHON3_LIBRARIES ${PYTHON_LIBRARIES})
 else ()
     set (PYTHON3_INCLUDE_DIRS)
     set (PYTHON3_LIBRARIES)
--- src/appleseed.python/CMakeLists.txt.orig
+++ src/appleseed.python/CMakeLists.txt
@@ -288,7 +288,7 @@ endif ()
 # Installation.
 #--------------------------------------------------------------------------------------------------
 
-set (py_module_dst "lib/python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}/appleseed")
+set (py_module_dst "lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/appleseed")
 
 install (FILES __init__.py DESTINATION ${py_module_dst})
 install (FILES logtarget.py DESTINATION ${py_module_dst})