diff --git a/ChangeLog b/ChangeLog
index 9024e62fc7..9ae4706a89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-04-07  Florian Weimer  <fweimer@redhat.com>
+
+	* resolv/res_mkquery.c (res_nmkquery): Remove IQUERY support.
+
 2017-04-05  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	* sysdeps/sparc/sparc32/Makefile (libc.so-gnulib): New rule.
diff --git a/NEWS b/NEWS
index 3590878a98..28bb00887a 100644
--- a/NEWS
+++ b/NEWS
@@ -41,6 +41,9 @@ Version 2.26
   "The Rules of Hungarian Orthography, 12th edition" and the work of
   Egmont Koblinger (Bug 18934).
 
+* res_mkquery and res_nmkquery no longer support the IQUERY opcode.  DNS
+  servers have not supported this opcode for a long time.
+
 Security related changes:
 
   [Add security related changes here]
diff --git a/resolv/res_mkquery.c b/resolv/res_mkquery.c
index d80b5318e5..4532b582a2 100644
--- a/resolv/res_mkquery.c
+++ b/resolv/res_mkquery.c
@@ -188,24 +188,6 @@ res_nmkquery(res_state statp,
 		hp->arcount = htons(1);
 		break;
 
-	case IQUERY:
-		/*
-		 * Initialize answer section
-		 */
-		if (__glibc_unlikely (buflen < 1 + RRFIXEDSZ + datalen))
-			return (-1);
-		*cp++ = '\0';	/* no domain name */
-		NS_PUT16 (type, cp);
-		NS_PUT16 (class, cp);
-		NS_PUT32 (0, cp);
-		NS_PUT16 (datalen, cp);
-		if (datalen) {
-			memcpy(cp, data, datalen);
-			cp += datalen;
-		}
-		hp->ancount = htons(1);
-		break;
-
 	default:
 		return (-1);
 	}