diff --git a/ChangeLog b/ChangeLog
index 607ab50642..5ee24033ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-09-21  Florian Weimer  <fweimer@redhat.com>
+
+	[BZ #20592]
+	Remove RR type classification macros.
+	* resolv/arpa/nameser.h (ns_t_qt_p, ns_t_mrr_p, ns_t_rr_p)
+	(ns_t_udp_p, ns_t_xfr_p): Remove.
+
 2016-09-21  Florian Weimer  <fweimer@redhat.com>
 
 	Remove misleading version information.
diff --git a/NEWS b/NEWS
index 5f7fc07c94..26b8045db5 100644
--- a/NEWS
+++ b/NEWS
@@ -50,6 +50,12 @@ Version 2.25
   only implemented minimal support for the previous version of DNSSEC, which
   is incompatible with the currently deployed version.
 
+* The resource record type classification macros ns_t_qt_p, ns_t_mrr_p,
+  ns_t_rr_p, ns_t_udp_p, ns_t_xfr_p have been removed from the
+  <arpa/nameser.h> header file because the distinction between RR types and
+  meta-RR types is not officially standardized, subject to revision, and
+  thus not suitable for encoding in a macro.
+
 Security related changes:
 
   On ARM EABI (32-bit), generating a backtrace for execution contexts which
diff --git a/resolv/arpa/nameser.h b/resolv/arpa/nameser.h
index f11b9f0ec7..a866ce8973 100644
--- a/resolv/arpa/nameser.h
+++ b/resolv/arpa/nameser.h
@@ -283,17 +283,6 @@ typedef enum __ns_type {
 	ns_t_max = 65536
 } ns_type;
 
-/* Exclusively a QTYPE? (not also an RTYPE) */
-#define	ns_t_qt_p(t) (ns_t_xfr_p(t) || (t) == ns_t_any || \
-		      (t) == ns_t_mailb || (t) == ns_t_maila)
-/* Some kind of meta-RR? (not a QTYPE, but also not an RTYPE) */
-#define	ns_t_mrr_p(t) ((t) == ns_t_tsig || (t) == ns_t_opt)
-/* Exclusively an RTYPE? (not also a QTYPE or a meta-RR) */
-#define ns_t_rr_p(t) (!ns_t_qt_p(t) && !ns_t_mrr_p(t))
-#define ns_t_udp_p(t) ((t) != ns_t_axfr && (t) != ns_t_zxfr)
-#define ns_t_xfr_p(t) ((t) == ns_t_axfr || (t) == ns_t_ixfr || \
-		       (t) == ns_t_zxfr)
-
 /*%
  * Values for class field
  */