diff -Nru distro-info-data-0.37ubuntu0.17/debian/changelog distro-info-data-0.37ubuntu0.18/debian/changelog
--- distro-info-data-0.37ubuntu0.17/debian/changelog	2023-05-01 14:04:56.000000000 +0000
+++ distro-info-data-0.37ubuntu0.18/debian/changelog	2024-05-03 10:13:19.000000000 +0000
@@ -1,3 +1,22 @@
+distro-info-data (0.37ubuntu0.18) bionic; urgency=medium
+
+  [ Benjamin Drung ]
+  * Add Ubuntu 24.04 LTS "Noble Numbat"
+  * Correct Ubuntu 6.10 EOL date to 2008-04-25
+  * Correct Ubuntu 16.04 ESM begin to 2021-04-30
+  * Move Ubuntu 12.04 ESM end date back to Friday, 2019-04-26
+  * Correct Debian 3.1 EOL date to 2008-03-31
+  * Correct Debian 7 EOL date to 2016-04-25
+  * Move Debian 9 EOL to the 9.13 release date 2020-07-18
+  * Move Debian 10 EOL to the 10.13 release date 2022-09-10
+  * Add Ubuntu 24.10 "Oracular Oriole" (LP: #2064136)
+  * Update year in debian/copyright
+
+  [ Jeremy Bícha ]
+  * debian.csv: Fix EOL date for 2.2
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Fri, 03 May 2024 12:13:19 +0200
+
 distro-info-data (0.37ubuntu0.17) bionic; urgency=medium
 
   * Add Ubuntu 23.10 Mantic Minotaur. (LP: #2018028)
diff -Nru distro-info-data-0.37ubuntu0.17/debian/copyright distro-info-data-0.37ubuntu0.18/debian/copyright
--- distro-info-data-0.37ubuntu0.17/debian/copyright	2023-05-01 14:04:56.000000000 +0000
+++ distro-info-data-0.37ubuntu0.18/debian/copyright	2024-05-03 10:12:16.000000000 +0000
@@ -3,7 +3,7 @@
 Upstream-Contact: Benjamin Drung <bdrung@debian.org>
 
 Files: *
-Copyright: 2009-2013, Benjamin Drung <bdrung@debian.org>
+Copyright: 2009-2024, Benjamin Drung <bdrung@debian.org>
 License: ISC
  Permission to use, copy, modify, and/or distribute this software for any
  purpose with or without fee is hereby granted, provided that the above
diff -Nru distro-info-data-0.37ubuntu0.17/debian.csv distro-info-data-0.37ubuntu0.18/debian.csv
--- distro-info-data-0.37ubuntu0.17/debian.csv	2023-05-01 14:04:56.000000000 +0000
+++ distro-info-data-0.37ubuntu0.18/debian.csv	2024-05-03 10:09:00.000000000 +0000
@@ -4,16 +4,16 @@
 1.3,Bo,bo,1996-12-12,1997-06-05,1999-03-09
 2.0,Hamm,hamm,1997-06-05,1998-07-24,2000-03-09
 2.1,Slink,slink,1998-07-24,1999-03-09,2000-10-30
-2.2,Potato,potato,1999-03-09,2000-08-15,2003-07-30
+2.2,Potato,potato,1999-03-09,2000-08-15,2003-06-30
 3.0,Woody,woody,2000-08-15,2002-07-19,2006-06-30
-3.1,Sarge,sarge,2002-07-19,2005-06-06,2008-03-30
+3.1,Sarge,sarge,2002-07-19,2005-06-06,2008-03-31
 4.0,Etch,etch,2005-06-06,2007-04-08,2010-02-15
 5.0,Lenny,lenny,2007-04-08,2009-02-14,2012-02-06
 6.0,Squeeze,squeeze,2009-02-14,2011-02-06,2014-05-31
-7,Wheezy,wheezy,2011-02-06,2013-05-04,2016-04-26
+7,Wheezy,wheezy,2011-02-06,2013-05-04,2016-04-25
 8,Jessie,jessie,2013-05-04,2015-04-26,2018-06-17
-9,Stretch,stretch,2015-04-26,2017-06-17,2020-07-06
-10,Buster,buster,2017-06-17,2019-07-06,2022-08-14
+9,Stretch,stretch,2015-04-26,2017-06-17,2020-07-18
+10,Buster,buster,2017-06-17,2019-07-06,2022-09-10
 11,Bullseye,bullseye,2019-07-06,2021-08-14,2024-08-14
 12,Bookworm,bookworm,2021-08-14,2023-06-10,2026-06-10
 13,Trixie,trixie,2023-06-10
diff -Nru distro-info-data-0.37ubuntu0.17/ubuntu.csv distro-info-data-0.37ubuntu0.18/ubuntu.csv
--- distro-info-data-0.37ubuntu0.17/ubuntu.csv	2023-05-01 14:04:31.000000000 +0000
+++ distro-info-data-0.37ubuntu0.18/ubuntu.csv	2024-05-03 10:09:06.000000000 +0000
@@ -3,7 +3,7 @@
 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
 6.06 LTS,Dapper Drake,dapper,2005-10-12,2006-06-01,2009-07-14,2011-06-01
-6.10,Edgy Eft,edgy,2006-06-01,2006-10-26,2008-04-26
+6.10,Edgy Eft,edgy,2006-06-01,2006-10-26,2008-04-25
 7.04,Feisty Fawn,feisty,2006-10-26,2007-04-19,2008-10-19
 7.10,Gutsy Gibbon,gutsy,2007-04-19,2007-10-18,2009-04-18
 8.04 LTS,Hardy Heron,hardy,2007-10-18,2008-04-24,2011-05-12,2013-05-09
@@ -14,7 +14,7 @@
 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-28,2017-04-28,2019-04-28
+12.04 LTS,Precise Pangolin,precise,2011-10-13,2012-04-26,2017-04-28,2017-04-28,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
@@ -22,7 +22,7 @@
 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-02-04
 15.10,Wily Werewolf,wily,2015-04-23,2015-10-22,2016-07-28
-16.04 LTS,Xenial Xerus,xenial,2015-10-22,2016-04-21,2021-04-21,2021-04-21,2026-04-23
+16.04 LTS,Xenial Xerus,xenial,2015-10-22,2016-04-21,2021-04-30,2021-04-30,2026-04-23
 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
@@ -38,3 +38,5 @@
 22.10,Kinetic Kudu,kinetic,2022-04-21,2022-10-20,2023-07-20
 23.04,Lunar Lobster,lunar,2022-10-20,2023-04-20,2024-01-25
 23.10,Mantic Minotaur,mantic,2023-04-20,2023-10-12,2024-07-11
+24.04 LTS,Noble Numbat,noble,2023-10-12,2024-04-25,2029-05-31,2029-05-31,2034-04-25
+24.10,Oracular Oriole,oracular,2024-04-25,2024-10-10,2025-07-10