diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 46e8b1e94a..627454cce1 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -18,7 +18,7 @@ add_custom_command(
     ${CMAKE_CURRENT_BINARY_DIR}/packhand_gen.h
     ${CMAKE_CURRENT_BINARY_DIR}/packhand_gen.cpp
   COMMAND
-    ${PYTHON_EXECUTABLE}
+    ${Python3_EXECUTABLE}
     ${CMAKE_SOURCE_DIR}/common/generate_packets.py
     "" # common/packets_gen.h
     "" # common/packets_gen.c
diff --git a/cmake/FindSphinx.cmake b/cmake/FindSphinx.cmake
index fb73fe6d37..24f5f003ff 100644
--- a/cmake/FindSphinx.cmake
+++ b/cmake/FindSphinx.cmake
@@ -1,8 +1,8 @@
 # Support for sphinx-build
 include(FindPackageHandleStandardArgs)
 
-if(PythonInterp_FOUND)
-  get_filename_component(_PYTHON_DIR "${PYTHON_EXECUTABLE}" DIRECTORY)
+if (Python3_Interpreter_FOUND)
+  get_filename_component(_PYTHON_DIR "${Python3_EXECUTABLE}" DIRECTORY)
     set(_PYTHON_PATHS
       "${_PYTHON_DIR}"
       "${_PYTHON_DIR}/bin"
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index ba57e8ca2d..b203e4fb9d 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -4,7 +4,7 @@ add_custom_command(
     ${CMAKE_CURRENT_BINARY_DIR}/packets_gen.h
     ${CMAKE_CURRENT_BINARY_DIR}/packets_gen.cpp
   COMMAND
-    ${PYTHON_EXECUTABLE}
+    ${Python3_EXECUTABLE}
     ${CMAKE_CURRENT_SOURCE_DIR}/generate_packets.py
     ${CMAKE_CURRENT_BINARY_DIR}/packets_gen.h
     ${CMAKE_CURRENT_BINARY_DIR}/packets_gen.cpp
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index bd08e6120a..89a6b4c9d6 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -6,7 +6,7 @@ add_custom_command(
     ${CMAKE_CURRENT_BINARY_DIR}/hand_gen.h
     ${CMAKE_CURRENT_BINARY_DIR}/hand_gen.cpp
   COMMAND
-    ${PYTHON_EXECUTABLE}
+    ${Python3_EXECUTABLE}
     ${CMAKE_SOURCE_DIR}/common/generate_packets.py
     "" # common/packets_gen.h
     "" # common/packets_gen.c
diff --git a/utility/CMakeLists.txt b/utility/CMakeLists.txt
index 4d558df198..e7fbfe1706 100644
--- a/utility/CMakeLists.txt
+++ b/utility/CMakeLists.txt
@@ -3,7 +3,7 @@ add_custom_command(
   OUTPUT
     ${CMAKE_CURRENT_BINARY_DIR}/specenum_gen.h
   COMMAND
-    ${PYTHON_EXECUTABLE}
+    ${Python3_EXECUTABLE}
     ${CMAKE_CURRENT_SOURCE_DIR}/generate_specenum.py
     ${CMAKE_CURRENT_BINARY_DIR}/specenum_gen.h
   VERBATIM