diff --git a/helpers/DATA/ubuntu-release-upgrader/patch_changes/010_define_independent_solver.patch b/helpers/DATA/ubuntu-release-upgrader/patch_changes/010-define_independent_solver.patch
similarity index 100%
rename from helpers/DATA/ubuntu-release-upgrader/patch_changes/010_define_independent_solver.patch
rename to helpers/DATA/ubuntu-release-upgrader/patch_changes/010-define_independent_solver.patch
diff --git a/helpers/DATA/ubuntu-release-upgrader/patch_changes/011-disable_screensaver_mate.patch b/helpers/DATA/ubuntu-release-upgrader/patch_changes/011-disable_screensaver_mate.patch
new file mode 100644
index 00000000..5ebc4edd
--- /dev/null
+++ b/helpers/DATA/ubuntu-release-upgrader/patch_changes/011-disable_screensaver_mate.patch
@@ -0,0 +1,27 @@
+diff --git a/DistUpgrade/DistUpgradeController.py b/DistUpgrade/DistUpgradeController.py
+index b7dd0af7..c06166b6 100644
+--- a/DistUpgrade/DistUpgradeController.py
++++ b/DistUpgrade/DistUpgradeController.py
+@@ -2708,10 +2708,18 @@ class DistUpgradeController(object):
+             # exits, the connection will be closed and screen inhibition
+             # will be removed.
+             self._session_bus = dbus.SessionBus()
+-            proxy = self._session_bus.get_object('org.freedesktop.ScreenSaver',
+-                                                 '/org/freedesktop/ScreenSaver')
+-            screensaver = dbus.Interface(proxy, dbus_interface='org.freedesktop.ScreenSaver')
+-            screensaver.Inhibit('trisquel-release-upgrader', 'Upgrading Trisquel')
++            try:
++                # Attempt standar "generic"
++                proxy = self._session_bus.get_object('org.freedesktop.ScreenSaver',
++                                                     '/org/freedesktop/ScreenSaver')
++                screensaver = dbus.Interface(proxy, dbus_interface='org.freedesktop.ScreenSaver')
++                screensaver.Inhibit('ubuntu-release-upgrader', 'Upgrading Ubuntu')
++            except Exception:
++                # Attempt MATE specific
++                proxy = self._session_bus.get_object('org.mate.ScreenSaver',
++                                                     '/org/mate/ScreenSaver')
++                screensaver = dbus.Interface(proxy, dbus_interface='org.mate.ScreenSaver')
++                screensaver.Inhibit('ubuntu-release-upgrader', 'Upgrading Ubuntu')
+ 
+             summary = _("Lock screen disabled")
+             message = _("Your lock screen has been "
diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader
index d9a902b9..d015282c 100644
--- a/helpers/make-ubuntu-release-upgrader
+++ b/helpers/make-ubuntu-release-upgrader
@@ -25,7 +25,7 @@
 # Also, don't forget to update the meta-release files at archive and packages.t.i
 # The "obsoletes" list from ubuntu has been removed
 
-VERSION=20
+VERSION=20.9
 
 . ./config
 # Previous upstream release name, update for each release.