diff -Nru systemd-237/debian/changelog systemd-237/debian/changelog
--- systemd-237/debian/changelog	2019-04-24 18:15:36.000000000 -0300
+++ systemd-237/debian/changelog	2019-06-04 15:54:24.000000000 -0300
@@ -1,3 +1,10 @@
+systemd (237-3ubuntu10.23) bionic; urgency=medium
+
+  * d/p/lp1818527-resolved-do-not-hit-CNAME-in-NODATA.patch:
+    - fix stub resolver cache (LP: #1818527)
+
+ -- Heitor Alves de Siqueira <halves@canonical.com>  Tue, 04 Jun 2019 15:54:24 -0300
+
 systemd (237-3ubuntu10.22) bionic; urgency=medium
 
   * d/p/resolved-rework-how-we-determine-which-scope-to-send.patch
diff -Nru systemd-237/debian/patches/lp1818527-resolved-do-not-hit-CNAME-in-NODATA.patch systemd-237/debian/patches/lp1818527-resolved-do-not-hit-CNAME-in-NODATA.patch
--- systemd-237/debian/patches/lp1818527-resolved-do-not-hit-CNAME-in-NODATA.patch	1969-12-31 21:00:00.000000000 -0300
+++ systemd-237/debian/patches/lp1818527-resolved-do-not-hit-CNAME-in-NODATA.patch	2019-06-04 15:54:11.000000000 -0300
@@ -0,0 +1,35 @@
+From 3740146a4cbd99883af79e375ee4836206dcea4e Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 13 Aug 2018 14:32:33 +0900
+Subject: [PATCH] resolve: do not hit CNAME or DNAME entry in NODATA cache (#9836)
+
+Fixes #9833.
+
+Origin: upstream, https://github.com/systemd/systemd/commit/3740146a4cbd
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1818527
+---
+ src/resolve/resolved-dns-cache.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: systemd-237/src/resolve/resolved-dns-cache.c
+===================================================================
+--- systemd-237.orig/src/resolve/resolved-dns-cache.c
++++ systemd-237/src/resolve/resolved-dns-cache.c
+@@ -809,7 +809,7 @@ static DnsCacheItem *dns_cache_get_by_ke
+         if (dns_type_may_redirect(k->type)) {
+                 /* Check if we have a CNAME record instead */
+                 i = hashmap_get(c->by_key, &DNS_RESOURCE_KEY_CONST(k->class, DNS_TYPE_CNAME, n));
+-                if (i)
++                if (i && i->type != DNS_CACHE_NODATA)
+                         return i;
+ 
+                 /* OK, let's look for cached DNAME records. */
+@@ -818,7 +818,7 @@ static DnsCacheItem *dns_cache_get_by_ke
+                                 return NULL;
+ 
+                         i = hashmap_get(c->by_key, &DNS_RESOURCE_KEY_CONST(k->class, DNS_TYPE_DNAME, n));
+-                        if (i)
++                        if (i && i->type != DNS_CACHE_NODATA)
+                                 return i;
+ 
+                         /* Jump one label ahead */
diff -Nru systemd-237/debian/patches/series systemd-237/debian/patches/series
--- systemd-237/debian/patches/series	2019-04-24 18:15:36.000000000 -0300
+++ systemd-237/debian/patches/series	2019-06-04 15:54:01.000000000 -0300
@@ -115,3 +115,4 @@
 networkd-fix-dhcp4-link-without-routes-not-being-con.patch
 ask-password-prevent-buffer-overrow-when-reading-fro.patch
 resolved-rework-how-we-determine-which-scope-to-send.patch
+lp1818527-resolved-do-not-hit-CNAME-in-NODATA.patch