diff -Nru distro-info-data-0.37ubuntu0.2/debian/changelog distro-info-data-0.37ubuntu0.3/debian/changelog
--- distro-info-data-0.37ubuntu0.2/debian/changelog	2018-10-30 14:00:16.000000000 +0000
+++ distro-info-data-0.37ubuntu0.3/debian/changelog	2019-03-07 19:29:06.000000000 +0000
@@ -1,3 +1,10 @@
+distro-info-data (0.37ubuntu0.3) bionic; urgency=medium
+
+  * Add in eol-server and eol-esm dates for all Ubuntu LTS releases.
+    (LP: #1814976, #1808038)
+
+ -- Brian Murray <brian@ubuntu.com>  Thu, 07 Mar 2019 11:29:06 -0800
+
 distro-info-data (0.37ubuntu0.2) bionic; urgency=medium
 
   * Copy data from 0.39:
diff -Nru distro-info-data-0.37ubuntu0.2/debian/control distro-info-data-0.37ubuntu0.3/debian/control
--- distro-info-data-0.37ubuntu0.2/debian/control	2018-05-08 19:39:42.000000000 +0000
+++ distro-info-data-0.37ubuntu0.3/debian/control	2019-03-07 19:29:06.000000000 +0000
@@ -13,7 +13,7 @@
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}
-Breaks: distro-info (<< 0.3~)
+Breaks: distro-info (<< 0.18ubuntu0.18.04.1~)
 Replaces: distro-info (<< 0.3~)
 Description: information about the distributions' releases (data files)
  Information about all releases of Debian and Ubuntu. The distro-info script
diff -Nru distro-info-data-0.37ubuntu0.2/ubuntu.csv distro-info-data-0.37ubuntu0.3/ubuntu.csv
--- distro-info-data-0.37ubuntu0.2/ubuntu.csv	2018-10-30 14:00:16.000000000 +0000
+++ distro-info-data-0.37ubuntu0.3/ubuntu.csv	2019-03-07 19:29:01.000000000 +0000
@@ -1,4 +1,4 @@
-version,codename,series,created,release,eol,eol-server
+version,codename,series,created,release,eol,eol-server,eol-esm
 4.10,Warty Warthog,warty,2004-03-05,2004-10-20,2006-04-30
 5.04,Hoary Hedgehog,hoary,2004-10-20,2005-04-08,2006-10-31
 5.10,Breezy Badger,breezy,2005-04-08,2005-10-12,2007-04-13
@@ -14,18 +14,18 @@
 10.10,Maverick Meerkat,maverick,2010-04-29,2010-10-10,2012-04-10
 11.04,Natty Narwhal,natty,2010-10-10,2011-04-28,2012-10-28
 11.10,Oneiric Ocelot,oneiric,2011-04-28,2011-10-13,2013-05-09
-12.04 LTS,Precise Pangolin,precise,2011-10-13,2012-04-26,2017-04-26
+12.04 LTS,Precise Pangolin,precise,2011-10-13,2012-04-26,2017-04-26,2017-04-26,2019-04-26
 12.10,Quantal Quetzal,quantal,2012-04-26,2012-10-18,2014-05-16
 13.04,Raring Ringtail,raring,2012-10-18,2013-04-25,2014-01-27
 13.10,Saucy Salamander,saucy,2013-04-25,2013-10-17,2014-07-17
-14.04 LTS,Trusty Tahr,trusty,2013-10-17,2014-04-17,2019-04-17
+14.04 LTS,Trusty Tahr,trusty,2013-10-17,2014-04-17,2019-04-17,2019-04-17,2022-04-17
 14.10,Utopic Unicorn,utopic,2014-04-17,2014-10-23,2015-07-23
 15.04,Vivid Vervet,vivid,2014-10-23,2015-04-23,2016-01-23
 15.10,Wily Werewolf,wily,2015-04-23,2015-10-22,2016-07-22
-16.04 LTS,Xenial Xerus,xenial,2015-10-22,2016-04-21,2021-04-21
+16.04 LTS,Xenial Xerus,xenial,2015-10-22,2016-04-21,2021-04-21,2021-04-21,2024-04-21
 16.10,Yakkety Yak,yakkety,2016-04-21,2016-10-13,2017-07-20
 17.04,Zesty Zapus,zesty,2016-10-13,2017-04-13,2018-01-13
 17.10,Artful Aardvark,artful,2017-04-13,2017-10-19,2018-07-19
-18.04 LTS,Bionic Beaver,bionic,2017-10-19,2018-04-26,2023-04-26
+18.04 LTS,Bionic Beaver,bionic,2017-10-19,2018-04-26,2023-04-26,2023-04-26,2028-04-26
 18.10,Cosmic Cuttlefish,cosmic,2018-04-26,2018-10-18,2019-07-18
 19.04,Disco Dingo,disco,2018-10-18,2019-04-18,2020-01-18
diff -Nru distro-info-data-0.37ubuntu0.2/validate-csv-data distro-info-data-0.37ubuntu0.3/validate-csv-data
--- distro-info-data-0.37ubuntu0.2/validate-csv-data	2017-10-24 20:11:56.000000000 +0000
+++ distro-info-data-0.37ubuntu0.3/validate-csv-data	2019-03-07 19:29:01.000000000 +0000
@@ -25,9 +25,9 @@
 _COLUMNS = {
     "debian": ("version", "codename", "series", "created", "release", "eol"),
     "ubuntu": ("version", "codename", "series", "created", "release", "eol",
-               "eol-server"),
+               "eol-server", "eol-esm"),
 }
-_DATES = ("created", "release", "eol", "eol-server")
+_DATES = ("created", "release", "eol", "eol-server", "eol-esm")
 _EARLIER_DATES = (
     ("created", "release"),
     ("release", "eol"),
@@ -108,7 +108,7 @@
             if date2 in row and row[date2]:
                 if date1 in row and row[date1]:
                     # date1 needs to be earlier than date2
-                    if row[date1] >= row[date2]:
+                    if row[date1] > row[date2]:
                         msg = ("Date %s of column `%s' needs to be later "
                                "than %s of column `%s'")
                         error(filename, csvreader.line_num, msg,