diff --git a/glibc-rh1670028.patch b/glibc-rh1670028.patch
index f7b6d13..d1dbe3f 100644
--- a/glibc-rh1670028.patch
+++ b/glibc-rh1670028.patch
@@ -17,6 +17,49 @@ index 8f22e6a154621238..ebe1b733f294a97c 100644
compat-hooks compat-gethnamaddr
libanl-routines := gai_cancel gai_error gai_misc gai_notify gai_suspend \
+diff --git a/resolv/res_enable_icmp.c b/resolv/res_enable_icmp.c
+new file mode 100644
+index 0000000000000000..bdc9220f08cef71d
+--- /dev/null
++++ b/resolv/res_enable_icmp.c
+@@ -0,0 +1,37 @@
++/* Enable full ICMP errors on a socket.
++ Copyright (C) 2019 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ . */
++
++#include
++#include
++#include
++
++int
++__res_enable_icmp (int family, int fd)
++{
++ int one = 1;
++ switch (family)
++ {
++ case AF_INET:
++ return setsockopt (fd, SOL_IP, IP_RECVERR, &one, sizeof (one));
++ case AF_INET6:
++ return setsockopt (fd, SOL_IPV6, IPV6_RECVERR, &one, sizeof (one));
++ default:
++ __set_errno (EAFNOSUPPORT);
++ return -1;
++ }
++}
diff --git a/resolv/res_send.c b/resolv/res_send.c
index fa040c1198fadce5..0f6ec83a7ba05986 100644
--- a/resolv/res_send.c