diff --git a/docs/changes.md b/docs/changes.md
index fd38d5b62a..13f062a078 100644
--- a/docs/changes.md
+++ b/docs/changes.md
@@ -10,6 +10,9 @@ Release date: `2018-06-xx`
 - [NXDRIVE-1229](https://jira.nuxeo.com/browse/NXDRIVE-1229): Do not install Drive in %APPDATA% but %LOCALAPPDATA% folder on Windows
 - [NXDRIVE-1232](https://jira.nuxeo.com/browse/NXDRIVE-1232): Split the macOS installer build to support macOS 10.11
 
+#### Minor changes
+- Tools: Fixed the changelog latest release tag guess
+
 
 # 3.1.0
 Release date: `2018-05-22`
diff --git a/tools/changelog.py b/tools/changelog.py
index aba1ba29b6..e6f7912b85 100644
--- a/tools/changelog.py
+++ b/tools/changelog.py
@@ -14,7 +14,7 @@
 
 import requests
 
-__version__ = '1.2.5'
+__version__ = '1.2.6'
 
 
 # Available formatters
@@ -122,12 +122,13 @@ def get_latest_tag():
 
     debug('>>> Retrieving latest created tag')
     cmd = 'git rev-list --tags --remove-empty --branches=master --max-count=10'
+    latest = ''
     for sha1 in backtick(cmd.split()).splitlines():
         cmd = 'git describe --abbrev=0 --tags ' + sha1
         tag = backtick(cmd.split())
-        if tag.startswith('release-'):
-            return tag
-    return ''
+        if tag.startswith('release-') and tag > latest:
+            latest = tag
+    return latest
 
 
 def get_issues(args):