diff -pruN 2.82-1/debian/changelog 2.82-1ubuntu1/debian/changelog
--- 2.82-1/debian/changelog	2020-09-17 15:38:58.000000000 +0000
+++ 2.82-1ubuntu1/debian/changelog	2020-09-17 15:38:58.000000000 +0000
@@ -1,3 +1,9 @@
+dnsmasq (2.82-1ubuntu1) groovy; urgency=medium
+
+  * src/radv.c: avoid leases to be issued forever when not set (LP: #1894619)
+
+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Wed, 16 Sep 2020 14:26:58 +0200
+
 dnsmasq (2.82-1) unstable; urgency=low
 
    * New upstream.
diff -pruN 2.82-1/debian/control 2.82-1ubuntu1/debian/control
--- 2.82-1/debian/control	2020-09-17 15:38:58.000000000 +0000
+++ 2.82-1ubuntu1/debian/control	2020-09-17 15:38:58.000000000 +0000
@@ -6,7 +6,8 @@ Build-depends: gettext, libnetfilter-con
                nettle-dev (>=2.4-3), libbsd-dev [kfreebsd-any],
 	       liblua5.2-dev, dh-runit, debhelper-compat (= 10),
                pkg-config
-Maintainer: Simon Kelley <simon@thekelleys.org.uk>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Simon Kelley <simon@thekelleys.org.uk>
 Homepage: http://www.thekelleys.org.uk/dnsmasq/doc.html
 Vcs-Git: http://thekelleys.org.uk/git/dnsmasq.git
 Vcs-Browser: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git
diff -pruN 2.82-1/src/radv.c 2.82-1ubuntu1/src/radv.c
--- 2.82-1/src/radv.c	2020-06-26 22:22:41.000000000 +0000
+++ 2.82-1ubuntu1/src/radv.c	2020-09-17 15:38:58.000000000 +0000
@@ -628,8 +628,9 @@ static int add_prefixes(struct in6_addr
 
 		/* find floor time, don't reduce below 3 * RA interval.
 		   If the lease time has been left as default, don't
-		   use that as a floor. */
-		if ((context->flags & CONTEXT_SETLEASE) &&
+		   use that as a floor.
+		   Always set lease time if requested to do so. */
+		if ((context->flags & CONTEXT_SETLEASE) ||
 		    time > context->lease_time)
 		  {
 		    time = context->lease_time;