diff --git a/SOURCES/1006-skip-DNS-resolution-for-tentative-IPv6-address-rh2166711.patch b/SOURCES/1006-skip-DNS-resolution-for-tentative-IPv6-address-rh2166711.patch
new file mode 100644
index 0000000..65a3a61
--- /dev/null
+++ b/SOURCES/1006-skip-DNS-resolution-for-tentative-IPv6-address-rh2166711.patch
@@ -0,0 +1,35 @@
+From 413b140ae639d38ffcc125dfc1ef7303f08abebd Mon Sep 17 00:00:00 2001
+From: Beniamino Galvani <bgalvani@redhat.com>
+Date: Tue, 14 Feb 2023 11:39:07 +0100
+Subject: [PATCH] device: skip DNS resolution for tentative IPv6 addresses
+
+A tentative IPv6 address can still fail DAD, so don't use it to
+resolve the hostname via DNS. Furthermore, tentative addresses can't
+be used to contact the nameserver and so the resolution will fail if
+there is no other valid IPv6 address. Wait that the address becomes
+non-tentative.
+
+(cherry picked from commit 4138be6a5a508af66b3b79c0eaeb43e3437ee345)
+(cherry picked from commit 0ebd75381963abc2fb75d39ab44367139db0e34b)
+(cherry picked from commit 26d5ad46806a2dc69238116796be0fbb2b7c273f)
+---
+ src/core/devices/nm-device.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
+index 461f57b5c1..9af4bf8988 100644
+--- a/src/core/devices/nm-device.c
++++ b/src/core/devices/nm-device.c
+@@ -17117,6 +17117,9 @@ get_address_for_hostname_dns_lookup(NMDevice *self, int addr_family)
+                 return g_inet_address_new_from_bytes(addr->address_ptr, G_SOCKET_FAMILY_IPV4);
+             }
+ 
++            if (addr->n_ifa_flags & IFA_F_TENTATIVE)
++                continue;
++
+             /* For IPv6 prefer, in order:
+              * - !link-local, !deprecated
+              * - !link-local, deprecated
+-- 
+2.39.1
+
diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec
index 4fde75e..92f214b 100644
--- a/SPECS/NetworkManager.spec
+++ b/SPECS/NetworkManager.spec
@@ -6,7 +6,7 @@
 %global epoch_version 1
 %global real_version 1.40.0
 %global rpm_version %{real_version}
-%global release_version 5
+%global release_version 6
 %global snapshot %{nil}
 %global git_sha %{nil}
 %global bcond_default_debug 0
@@ -200,6 +200,7 @@ Patch1002: 1002-dns-sort-according-to-priority-rh2134563.patch
 Patch1003: 1003-dhcp-decline-IPv6-lease-if-all-adresses-fail-DAD-rh2132281.patch
 Patch1004: 1004-ovs-wait-that-links-disappear-during-initial-cleanup-rh2153429.patch
 Patch1005: 1005-core-wait-for-carrier-before-resolving-hostname-via-rh2152891.patch
+Patch1006: 1006-skip-DNS-resolution-for-tentative-IPv6-address-rh2166711.patch
 
 Requires(post): systemd
 %if 0%{?fedora} || 0%{?rhel} >= 8
@@ -1235,11 +1236,14 @@ fi
 
 
 %changelog
-* Fri Dec 16 2022 Fernando Fernandez Mancera <ferferna@redhat.com> 1:1.40.0-5
+* Wed Mar  1 2023 Beniamino Galvani <bgalvani@redhat.com> - 1:1.40.0-6
+- Fix hostname resolution from tentative IPv6 addresses (rh #2166711)
+
+* Fri Dec 16 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 1:1.40.0-5
 - ovs: wait that links disappear during initial cleanup (rh #2153429)
 - core: wait for carrier before resolving hostname via DNS (rh #2152891)
 
-* Mon Nov 28 2022 Fernando Fernandez Mancera <ferferna@redhat.com> 1:1.40.0-4
+* Mon Nov 28 2022 Fernando Fernandez Mancera <ferferna@redhat.com> - 1:1.40.0-4
 - dhcp: decline IPv6 lease if all addresses fail DAD (rh #2132281)
 
 * Tue Nov  8 2022 Beniamino Galvani <bgalvani@redhat.com> - 1:1.40.0-3