diff --git a/ChangeLog b/ChangeLog
index 0b2a407132..26f303f94e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-05-11  Ulrich Drepper  <drepper@redhat.com>
 
+	* include/arpa/nameser.h: Declare _ns_flagdata as hidden.
+
 	* nis/yp_xdr.c: Add libnsl_hidden_def for xdr_ypresp_master.
 	* include/rpcsvc/yp.h: Add libnsl_hidden_proto for xdr_ypresp_master.
 
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index 449f5b452e..efbe956602 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -7,6 +7,8 @@
 #include <stdint.h>
 #include <netinet/in.h>
 
+extern struct _ns_flagdata _ns_flagdata[] attribute_hidden;
+
 #if _STRING_ARCH_unaligned
 
 # undef NS_GET16