diff --git a/debian/changelog b/debian/changelog
index 9bd67a3f8..2c855eae1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+yunohost (2.7.13.5) testing; urgency=low
+
+  * [fix] a bug when log to be fetched is empty
+  * [fix] a bug when computing diff in regen_conf
+  * [stretch-migration] Tell postgresql-common to not send an email about 9.4->9.6 migration
+  * [stretch-migration] Close port 465 / open port 587 during migration according to SMTP port change in postfix
+  * [stretch-migration] Rely on /etc/os-release to get debian release number
+
+  Fixes by Bram and Aleks
+
+ -- Alexandre Aubin <alex.aubin@mailoo.org>  Tue, 12 Jun 2018 01:00:00 +0000
+
 yunohost (2.7.13.4) testing; urgency=low
 
   * Fix a bug for services with alternate names (mysql<->mariadb)
diff --git a/locales/en.json b/locales/en.json
index e7bfd2ded..4ca65826c 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -235,7 +235,7 @@
     "migration_0003_not_jessie": "The current debian distribution is not Jessie !",
     "migration_0003_system_not_fully_up_to_date": "Your system is not fully up to date. Please perform a regular upgrade before running the migration to stretch.",
     "migration_0003_still_on_jessie_after_main_upgrade": "Something wrong happened during the main upgrade : system is still on Jessie !? To investigate the issue, please look at {log} :s ...",
-    "migration_0003_general_warning": "Please note that this migration is a delicate operation. While the YunoHost team did its best to review and test it, the migration might still break parts of the system or apps.\n\nTherefore, we recommend you to :\n    - Perform a backup of any critical data or app ;\n    - Be patient after launching the migration : depending on your internet connection and hardware, it might take up to a few hours for everything to upgrade.",
+    "migration_0003_general_warning": "Please note that this migration is a delicate operation. While the YunoHost team did its best to review and test it, the migration might still break parts of the system or apps.\n\nTherefore, we recommend you to :\n    - Perform a backup of any critical data or app. More infos on https://yunohost.org/backup ;\n    - Be patient after launching the migration : depending on your internet connection and hardware, it might take up to a few hours for everything to upgrade.\n\nAdditionally, the port for SMTP, used by external email clients (like Thunderbird or K9-Mail) was changed from 465 (SSL/TLS) to 587 (STARTTLS). The old port 465 will automatically be closed and the new port 587 will be opened in the firewall. You and your users *will* have to adapt the configuration of your email clients accordingly!",
     "migration_0003_problematic_apps_warning": "Please note that the following possibly problematic installed apps were detected. It looks like those were not installed from an applist or are not flagged as 'working'. Consequently, we cannot guarantee that they will still work after the upgrade : {problematic_apps}",
     "migration_0003_modified_files": "Please note that the following files were found to be manually modified and might be overwritten at the end of the upgrade : {manually_modified_files}",
     "migrations_backward": "Migrating backward.",
diff --git a/src/yunohost/data_migrations/0003_migrate_to_stretch.py b/src/yunohost/data_migrations/0003_migrate_to_stretch.py
index 105480241..c291a31b7 100644
--- a/src/yunohost/data_migrations/0003_migrate_to_stretch.py
+++ b/src/yunohost/data_migrations/0003_migrate_to_stretch.py
@@ -16,6 +16,7 @@ from yunohost.service import (_run_service_command,
 from yunohost.utils.filesystem import free_space_in_directory
 from yunohost.utils.packages import get_installed_version
 from yunohost.utils.network import get_network_interfaces
+from yunohost.firewall import firewall_allow, firewall_disallow
 
 logger = getActionLogger('yunohost.migration')
 
@@ -75,6 +76,11 @@ class MyMigration(Migration):
         os.system("apt autoremove --assume-yes")
         os.system("apt clean --assume-yes")
 
+        # We moved to port 587 for SMTP
+        # https://busylog.net/smtp-tls-ssl-25-465-587/
+        firewall_allow("Both", 587)
+        firewall_disallow("Both", 465)
+
         # Upgrade yunohost packages
         logger.warning(m18n.n("migration_0003_yunohost_upgrade"))
         self.restore_files_to_keep()
@@ -82,11 +88,13 @@ class MyMigration(Migration):
         self.upgrade_yunohost_packages()
 
     def debian_major_version(self):
-        # We rely on lsb_release instead of the python module "platform",
-        # because "platform" relies on uname, which on some weird setups does
-        # not behave correctly (still says running Jessie when lsb_release says
-        # Stretch...)
-        return int(check_output("lsb_release -r").split("\t")[1][0])
+        # The python module "platform" and lsb_release are not reliable because
+        # on some setup, they still return Release=8 even after upgrading to
+        # stretch ... (Apparently this is related to OVH overriding some stuff
+        # with /etc/lsb-release for instance -_-)
+        # Instead, we rely on /etc/os-release which should be the raw info from
+        # the distribution...
+        return int(check_output("grep VERSION_ID /etc/os-release | tr '\"' ' ' | cut -d ' ' -f2"))
 
     def yunohost_major_version(self):
         return int(get_installed_version("yunohost").split('.')[0])
diff --git a/src/yunohost/service.py b/src/yunohost/service.py
index 0ce8073fa..ef711a4a9 100644
--- a/src/yunohost/service.py
+++ b/src/yunohost/service.py
@@ -709,7 +709,7 @@ def _tail(file, n):
                 lines = f.read().splitlines()
 
                 if len(lines) >= to_read or pos == 0:
-                    return lines[-to_read]
+                    return lines[-to_read:]
 
                 avg_line_length *= 1.3