diff --git a/release.py b/release.py
index 4673b1c8a002584557cecd090ee76d74c1ee9453..b685c471e9f2d8c42967c8b2afd7c288cb70b7cb 100755
--- a/release.py
+++ b/release.py
@@ -3,8 +3,11 @@
 
 import argparse
 import os
+import re
 import sys
-from subprocess import check_call
+from subprocess import check_call, check_output
+
+from weboob.tools.misc import to_unicode
 
 WORKTREE = 'release_tmp'
 OPTIONS = ['--qt', '--xdg']
@@ -44,15 +47,124 @@ def make_tarball(tag, wheel):
     print('To upload to PyPI, run: twine upload -s %s' % ' '.join(files))
 
 
+def changelog(start, end='HEAD'):
+    # TODO new modules, deleted modules
+    def sortkey(d):
+        """Put the commits with multiple domains at the end"""
+        return (len(d), d)
+
+    commits = {}
+    for commithash in check_output(['git', 'rev-list', '{}..{}'.format(start, end)]).splitlines():
+        title, domains = commitinfo(commithash)
+        commits.setdefault(domains, []).append(title)
+
+    cl = ''
+    for domains in sorted(commits.keys(), key=sortkey):
+        cl += '\n\n\t' + '\n\t'.join(domains)
+        for title in commits[domains]:
+            cl += '\n\t* ' + title
+
+    return cl.lstrip('\n')
+
+
+def domain(path):
+    dirs = os.path.dirname(path).split('/')
+    if dirs == ['']:
+        return 'General: Core'
+    if dirs[0] == 'man' or path == 'tools/py3-compatible.modules':
+        return None
+    if dirs[0] == 'weboob':
+        try:
+            if dirs[1] in ('core', 'tools'):
+                return 'General: Core'
+            elif dirs[1] == 'capabilities':
+                return 'Capabilities'
+            elif dirs[1] == 'browser':
+                try:
+                    if dirs[2] == 'filters':
+                        return 'Browser: Filters'
+                except IndexError:
+                    return 'Browser'
+            elif dirs[1] == 'deprecated':
+                return 'Old Browser'
+            elif dirs[1] == 'applications':
+                try:
+                    return 'Applications: {}'.format(dirs[2])
+                except IndexError:
+                    return 'Applications'
+            elif dirs[1] == 'application':
+                try:
+                    return 'Applications: {}'.format(dirs[2].title())
+                except IndexError:
+                    return 'Applications'
+        except IndexError:
+            return 'General: Core'
+    if dirs[0] in ('contrib', 'tools'):
+        return 'Tools'
+    if dirs[0] in ('docs', 'icons'):
+        return 'Documentation'
+    if dirs[0] == 'modules':
+        try:
+            return 'Modules: {}'.format(dirs[1])
+        except IndexError:
+            return 'General: Core'
+    return 'Unknown'
+
+
+def commitinfo(commithash):
+    info = check_output(['git', 'show', '--format=%s', '--name-only', commithash]).splitlines()
+    title = to_unicode(info[0])
+    domains = set([domain(p) for p in info[2:] if domain(p)])
+    if 'Unknown' in domains and len(domains) > 1:
+        domains.remove('Unknown')
+    if not domains or len(domains) > 5:
+        domains = set(['Unknown'])
+
+    if 'Unknown' not in domains:
+        # When the domains are known, hide the title prefixes
+        title = re.sub('^(?:[\w\./\s]+:|\[[\w\./\s]+\])\s*', '', title, flags=re.UNICODE)
+
+    return title, tuple(sorted(domains))
+
+
+def previous_version():
+    """
+    Get the highest version tag
+    """
+    for v in check_output(['git', 'tag', '-l', '*.*', '--sort=-v:refname']).splitlines():
+        return v
+
+
+def prepare(start, end, version):
+    print(changelog(start, end))
+
+
 if __name__ == '__main__':
-    parser = argparse.ArgumentParser()
+    parser = argparse.ArgumentParser(
+        description="Prepare and export a release.",
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+        epilog='This is mostly meant to be called from release.sh for now.',
+    )
+
     subparsers = parser.add_subparsers()
 
-    tarball_parser = subparsers.add_parser('tarball')
+    prepare_parser = subparsers.add_parser(
+        'prepare',
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+    prepare_parser.add_argument('version')
+    prepare_parser.add_argument('--start', default=previous_version(), help='Commit of the previous release')
+    prepare_parser.add_argument('--end', default='HEAD', help='Last commit before the new release')
+    prepare_parser.set_defaults(mode='prepare')
+
+    tarball_parser = subparsers.add_parser(
+        'tarball',
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
     tarball_parser.add_argument('tag')
     tarball_parser.add_argument('--no-wheel', action='store_false', dest='wheel')
     tarball_parser.set_defaults(mode='tarball')
 
     args = parser.parse_args()
-    if args.mode == 'tarball':
+    if args.mode == 'prepare':
+        prepare(args.start, args.end, args.version)
+    elif args.mode == 'tarball':
         make_tarball(args.tag, args.wheel)
diff --git a/tools/generate_changelog_modules.sh b/tools/generate_changelog_modules.sh
deleted file mode 100755
index 5db6c03faa185f3b185f3ccfcac3a3ab8b5ca1b3..0000000000000000000000000000000000000000
--- a/tools/generate_changelog_modules.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-# Usage: weboob$ tools/generate_changelog_modules.sh TAG "list of hash" [show]
-
-
-BEGIN=$1
-EXCLUDE=$2
-SHOW=$3
-
-for a in modules/*
-do 
-	if [ -d $a ]
-	then
-		MODULE=`basename $a`
-		LOG=`git log  --format="%H:::* %s"  --date-order --reverse "$BEGIN..HEAD"  -- $a`
-		for b in $EXCLUDE
-		do
-			LOG=$(echo "$LOG" |grep -v $b)
-		done
-		if [ -n "$LOG" ]
-		then
-			if [ -n "$SHOW" ]
-			then
-				echo "$LOG" | awk -F ":::" '{print $1}' | git show --stdin
-			else
-				echo -e "\tModules: $MODULE"
-				echo "$LOG" | awk -F ":::" '{print "\t"$2}' | sed "s/$MODULE: //" | sed "s/\[$MODULE\] //"
-				echo ""
-			fi
-		fi
-	fi
-done