diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 93bfe71f5..1be0bc4ba 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -79,6 +79,7 @@ Build::
   * core: fix build with CMake and Ninja
   * debian: add package weechat-headless with the headless binary and its man page
   * javascript: fix compilation of javascript plugin with autotools on some Linux distributions (issue #1208)
+  * python: add detection of Python 3.7
 
 [[v2.1]]
 == Version 2.1 (2018-03-18)
diff --git a/cmake/FindPython.cmake b/cmake/FindPython.cmake
index e2647c48f..c8cbbb0bc 100644
--- a/cmake/FindPython.cmake
+++ b/cmake/FindPython.cmake
@@ -35,7 +35,7 @@ endif()
 
 if(ENABLE_PYTHON3)
   find_program(PYTHON_EXECUTABLE
-    NAMES python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+    NAMES python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
     PATHS /usr/bin /usr/local/bin /usr/pkg/bin
     )
 else()
@@ -67,7 +67,7 @@ if(PYTHON_EXECUTABLE)
     )
   if(ENABLE_PYTHON3)
     find_library(PYTHON_LIBRARY
-      NAMES python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+      NAMES python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
       HINTS ${PYTHON_POSSIBLE_LIB_PATH}
       )
   else()
diff --git a/configure.ac b/configure.ac
index b41d9d43e..0d908e83b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -547,7 +547,7 @@ PYTHON_VERSION=
 
 if test "x$enable_python" = "xyes" ; then
     if test "x$enable_python3" = "xyes" ; then
-        AC_PATH_PROGS(PYTHON, python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python2 python)
+        AC_PATH_PROGS(PYTHON, python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python2 python)
     else
         AC_PATH_PROGS(PYTHON, python2.7 python2.6 python2.5 python2 python)
     fi