diff -Nru ubuntu-release-upgrader-0.220.10/data/mirrors.cfg ubuntu-release-upgrader-0.220.11/data/mirrors.cfg
--- ubuntu-release-upgrader-0.220.10/data/mirrors.cfg	2016-11-30 18:07:50.000000000 +0000
+++ ubuntu-release-upgrader-0.220.11/data/mirrors.cfg	2019-05-01 22:09:41.000000000 +0000
@@ -17,6 +17,7 @@
 #commercial (both urls are valid)
 http://archive.canonical.com
 http://archive.canonical.com/ubuntu/
+https://esm.ubuntu.com/ubuntu/
 
 #commercial-ppas
 https://private-ppa.launchpad.net/commercial-ppa-uploaders
@@ -1053,3 +1054,136 @@
 http://ftp.gts.lug.ro/ubuntu/
 http://mirror.poliwangi.ac.id/ubuntu/
 http://repo.gust.edu.kw/ubuntu/
+http://mirror.enzu.com/ubuntu/
+http://mirror.genesisadaptive.com/ubuntu/
+http://mirror.init7.net/ubuntu/
+http://mirror.nl.datapacket.com/ubuntu/
+http://mirrors.layeronline.com/ubuntu/
+http://mirrors.xtom.com/ubuntu/
+http://ubuntu.mirror.iodc.dk/ubuntu/
+http://mirror.deace.id/ubuntu/
+http://ftp.belnet.be/ubuntu/
+http://ir.ubuntu.sindad.cloud/ubuntu/
+http://linux.yz.yamagata-u.ac.jp/ubuntu/
+http://mirror.23media.com/ubuntu/
+http://mirror.armaghan.net/ubuntu/
+http://mirror.iodc.dk/ubuntu/
+http://mirror.linux-ia64.org/ubuntu/
+http://mirror.niif.hu/ubuntu/
+http://mirror.nodesdirect.com/ubuntu/
+http://mirror.onevip.mk/ubuntu/
+http://mirror.serverius.net/ubuntu/
+http://mirror.truenetwork.ru/ubuntu/
+http://mirror.usetelecom.com.br/ubuntu/
+http://mirror.vpgrp.io/ubuntu/
+http://mirror.wtnet.de/ubuntu/
+http://mirror.xtom.com.hk/ubuntu/
+http://mirrors.bangmod.cloud/ubuntu/
+http://mirrors.mivocloud.com/ubuntu/
+http://mirrors.nav.ro/ubuntu/
+http://mirrors.nxthost.com/ubuntu/
+http://mirrors.piconets.webwerks.in/ubuntu-mirror/ubuntu/
+http://mirrors.ptisp.pt/ubuntu/
+http://mirrors.ukfast.co.uk/sites/archive.ubuntu.com/
+http://no.mirrors.blix.com/ubuntu/
+http://pubmirror01.lwlcom.net/ubuntu/
+http://repos.del.extreme-ix.org/ubuntu/
+http://ubuntu-archive.mirrors.estointernet.in/
+http://ubuntu.ca-west.mirror.fullhost.io/ubuntu/
+http://ubuntu.colocall.net/ubuntu/
+http://ubuntu.connesi.it/ubuntu/
+http://ubuntu.hostiran.ir/ubuntuarchive/
+http://ubuntu.melbourneitmirror.net/archive/
+http://ubuntu.mirror.datamossa.io/ubuntu/
+http://ubuntu.mirrors.theom.nz/
+http://aze.archive.ubuntu.com/ubuntu/
+http://mirror.ufam.edu.br/ubuntu/
+http://mirrors.fastdns.ca/ubuntu/
+http://repositorio.nti.ufal.br/ubuntu/
+http://ubuntu.asis.ac/
+http://ubuntu.mirrors.ovh.net/ubuntu/
+http://hu.archive.ubuntu.com/ubuntu/
+http://mirror.kakao.com/ubuntu/
+http://mirror.siena.edu/ubuntu/
+ftp://mirrors.fnl.bupt.maojianwei.com/Ubuntu_apt_mirror/
+http://repo.ialab.dsu.edu/ubuntu/
+http://ubuntu.mirror.serverloft.de/ubuntu/
+http://ubuntu.xaas.ir/
+http://archive.ubuntu.mirror.ba/ubuntu/
+http://linuxmirror.es/ubuntu/
+http://fireball-public.phys.wvu.edu/mirror/ubuntu/
+http://ftp.fsn.hu/ubuntu/
+http://ftp.harukasan.org/ubuntu/
+http://ftp.rnl.tecnico.ulisboa.pt/pub/ubuntu/archive/
+http://ftp.upcnet.ro/mirrors/ubuntu.com/ubuntu/
+http://glua.ua.pt/pub/ubuntu/
+http://kozyatagi.mirror.guzel.net.tr/ubuntu/
+http://mirror-hk.koddos.net/ubuntu/
+http://mirror.as24220.net/pub/ubuntu-archive/
+http://mirror.biznetgio.com/ubuntu/
+http://mirror.cs.jmu.edu/pub/ubuntu/
+http://mirror.datacenter.mn/ubuntu/
+http://mirror.fsmg.org.nz/ubuntu/
+http://mirror.hoster.kz/ubuntu/
+http://mirror.hostnet.nl/ubuntu/archive/
+http://mirror.kamp.de/ubuntu/
+http://mirror.kumi.systems/ubuntu/
+http://mirror.launtel.net.au/ubuntu/
+http://mirror.linux.pizza/ubuntu/
+http://mirror.mrjester.net/ubuntu/archive/
+http://mirror.muvhost.com/ubuntu/
+http://mirror.netsite.dk/ubuntu/archive/
+http://mirror.ng/ubuntu-archive/
+http://mirror.operationtulip.com/ubuntu/
+http://mirror.previder.nl/ubuntu/
+http://mirror.ps.kz/ubuntu/
+http://mirror.ratiokontakt.de/mirror/ubuntu/
+http://mirror.steadfastnet.com/ubuntu/
+http://mirror.team-cymru.com/ubuntu/
+http://mirror.tedra.es/ubuntu/
+http://mirror.thaidns.co.th/ubuntu/
+http://mirror.tuxcall.de/ubuntu-archive/
+http://mirror.ufca.edu.br/mirror/ubuntu-archive/
+http://mirror.unimagdalena.edu.co/ubuntu/
+http://mirror.us-midwest-1.nexcess.net/ubuntu/
+http://mirror.vpsnet.com/ubuntu/
+http://mirror.xeonbd.com/ubuntu-archive/
+http://mirrors.cloud.linets.cl/ubuntu/
+http://mirrors.huaweicloud.com/repository/ubuntu/
+http://mirrors.isu.net.sa/pub/ubuntu-releases/
+http://mirrors.lug.mtu.edu/ubuntu/
+http://mirrors.nju.edu.cn/ubuntu/
+http://mirrors.powernet.com.ru/ubuntu/
+http://mirrors.ulbsibiu.ro/ubuntu/
+http://mirrors.webtuga.pt/ubuntu/
+http://mozart.ee.ic.ac.uk/ubuntu-archive/
+http://packages.oth-regensburg.de/ubuntu/
+http://rep-ubuntu-il.upress.io/ubuntu/
+http://repo.miserver.it.umich.edu/ubuntu/
+http://ubuntu.archive.kw.zain.com/
+http://ubuntu.bhs.mirrors.ovh.net/ubuntu/
+http://ubuntu.mirror.globo.tech/
+http://mirror.solnode.io/ubuntu/releases/
+http://ubuntu.netforce.hosting/ubuntu/
+http://ubuntu.turhost.com/ubuntu/
+http://ubuntu.vargonen.com/ubuntu/
+http://ubuntu.whats-in.space/ubuntu/
+http://download.nust.na/pub/ubuntu/ubuntu/
+http://ftp.lanet.kr/ubuntu/
+http://mirror.clearsky.vn/ubuntu/
+http://mirror.ehost.vn/ubuntu/
+http://mirror.library.ucy.ac.cy/linux/ubuntu/archive/
+http://mirror.renu.ac.ug/ubuntu/
+http://mirror.upb.edu.co/ubuntu/
+http://mirrors.njupt.edu.cn/ubuntu/
+http://mirrors.nwafu.edu.cn/ubuntu/
+http://mirrors.vcea.wsu.edu/ubuntu/
+http://mirrors.vhost.vn/ubuntu/
+http://quantum-mirror.hu/mirrors/pub/ubuntu/
+http://repo.inara.pk/ubuntu/
+ftp://mirror.ricta.org.rw/ubuntu/
+http://ubuntu.cybertips.info/ubuntu/
+http://ubuntu.mirror.myduniahost.com/ubuntu/
+http://ubuntu.mirror.snu.edu.in/ubuntu/
+http://mirror.retentionrange.co.bw/ubuntu/
+http://repo.iut.ac.ir/repo/Ubuntu/
Binary files /tmp/tmpywDwKe/OxTuVLtuhh/ubuntu-release-upgrader-0.220.10/data/ubuntu-esm-v2-keyring.gpg and /tmp/tmpywDwKe/RZofirTwmM/ubuntu-release-upgrader-0.220.11/data/ubuntu-esm-v2-keyring.gpg differ
diff -Nru ubuntu-release-upgrader-0.220.10/debian/changelog ubuntu-release-upgrader-0.220.11/debian/changelog
--- ubuntu-release-upgrader-0.220.10/debian/changelog	2018-04-09 14:03:22.000000000 +0000
+++ ubuntu-release-upgrader-0.220.11/debian/changelog	2019-05-01 22:09:41.000000000 +0000
@@ -1,3 +1,12 @@
+ubuntu-release-upgrader (1:0.220.11) trusty; urgency=medium
+
+  * DistUpgradeController.py: Handle the transition of ESM during the release
+    upgrade. (LP: #1824862)
+  * DistUpgrade/build-tarball.sh: include ESM archive's gpg key.
+  * mirrors.cfg: add in esm.ubuntu.com as an official mirror, update mirrors.
+
+ -- Brian Murray <brian@ubuntu.com>  Wed, 01 May 2019 15:09:41 -0700
+
 ubuntu-release-upgrader (1:0.220.10) trusty-security; urgency=medium
 
   * Properly drop permissions when opening a browser. (LP: #1174007)
diff -Nru ubuntu-release-upgrader-0.220.10/DistUpgrade/build-tarball.sh ubuntu-release-upgrader-0.220.11/DistUpgrade/build-tarball.sh
--- ubuntu-release-upgrader-0.220.10/DistUpgrade/build-tarball.sh	2015-09-29 19:56:19.000000000 +0000
+++ ubuntu-release-upgrader-0.220.11/DistUpgrade/build-tarball.sh	2019-05-01 22:09:41.000000000 +0000
@@ -35,7 +35,7 @@
 tar -c -h -v --exclude DistUpgrade --exclude=$DIST.tar --exclude=$0 -X build-exclude.txt -f $DIST.tar  ./*
 
 # add *.cfg and *.ui to the tarball, copy links (demotions) in place
-tar --append -h -v -f $DIST.tar --transform 's|.*/|./|' ../data/*.cfg* ../data/gtkbuilder/*.ui
+tar --append -h -v -f $DIST.tar --transform 's|.*/|./|' ../data/*.cfg* ../data/gtkbuilder/*.ui ../data/*.gpg
 
 # add "DistUpgrade"  symlink as symlink
 tar --append -v -f $DIST.tar ./DistUpgrade
diff -Nru ubuntu-release-upgrader-0.220.10/DistUpgrade/DistUpgradeController.py ubuntu-release-upgrader-0.220.11/DistUpgrade/DistUpgradeController.py
--- ubuntu-release-upgrader-0.220.10/DistUpgrade/DistUpgradeController.py	2014-11-13 22:08:13.000000000 +0000
+++ ubuntu-release-upgrader-0.220.11/DistUpgrade/DistUpgradeController.py	2019-05-01 22:09:41.000000000 +0000
@@ -588,6 +588,18 @@
         # collect information on what components (main,universe) are enabled for what distro (sub)version
         # e.g. found_components = { 'hardy':set("main","restricted"), 'hardy-updates':set("main") }
         self.found_components = {}
+        # special case for ESM
+        for entry in self.sources.list[:]:
+            if (not entry.disabled and
+                entry.uri.endswith("esm.ubuntu.com/ubuntu") and
+                entry.dist == self.fromDist):
+                entry.dist = '%s-updates' % self.fromDist
+                sec_entry = copy.copy(entry)
+                sec_entry.dist = '%s-security' % self.fromDist
+                self.sources.list.append(sec_entry)
+                shutil.copy("ubuntu-esm-v2-keyring.gpg",
+                            "/etc/apt/trusted.gpg.d/")
+
         for entry in self.sources.list[:]:
 
             # ignore invalid records or disabled ones
diff -Nru ubuntu-release-upgrader-0.220.10/DistUpgrade/DistUpgradeVersion.py ubuntu-release-upgrader-0.220.11/DistUpgrade/DistUpgradeVersion.py
--- ubuntu-release-upgrader-0.220.10/DistUpgrade/DistUpgradeVersion.py	2016-11-30 18:08:03.000000000 +0000
+++ ubuntu-release-upgrader-0.220.11/DistUpgrade/DistUpgradeVersion.py	2019-05-01 22:09:41.000000000 +0000
@@ -1 +1 @@
-VERSION='0.220.9'
+VERSION='0.220.11'