diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 4375a336e..0436a7ab3 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -58,6 +58,7 @@ Bug fixes::
 Build::
 
   * core: fix compilation on FreeBSD with autotools (issue #276)
+  * python: add detection of Python 3.6
   * ruby: add detection of Ruby 2.4 (issue #895)
 
 [[v1.7.1]]
diff --git a/cmake/FindPython.cmake b/cmake/FindPython.cmake
index 7b0aa998c..7ef689995 100644
--- a/cmake/FindPython.cmake
+++ b/cmake/FindPython.cmake
@@ -35,7 +35,7 @@ endif()
 
 if(ENABLE_PYTHON3)
   find_program(PYTHON_EXECUTABLE
-    NAMES python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+    NAMES 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.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python
+      NAMES 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()