diff --git a/ares/CHANGES b/ares/CHANGES
index 1cc64ff63..a2207cb4b 100644
--- a/ares/CHANGES
+++ b/ares/CHANGES
@@ -1,5 +1,9 @@
   Changelog for the c-ares project
 
+* April 7
+- Tupone Alfredo fixed includes of arpa/nameser_compat.h to build fine on Mac
+  OS X.
+
 * April 5
 
 - Dominick Meglio: Provided implementations of inet_net_pton and inet_pton
diff --git a/ares/ares_expand_name.c b/ares/ares_expand_name.c
index 0942bfa98..114d0c507 100644
--- a/ares/ares_expand_name.c
+++ b/ares/ares_expand_name.c
@@ -21,6 +21,9 @@
 #else
 #include <netinet/in.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #endif
 
 #include <stdlib.h>
diff --git a/ares/ares_gethostbyaddr.c b/ares/ares_gethostbyaddr.c
index 265b89d24..09e0dd39b 100644
--- a/ares/ares_gethostbyaddr.c
+++ b/ares/ares_gethostbyaddr.c
@@ -23,6 +23,9 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #endif
 
 #include <stdio.h>
diff --git a/ares/ares_gethostbyname.c b/ares/ares_gethostbyname.c
index fddfda7d6..8d77fdefe 100644
--- a/ares/ares_gethostbyname.c
+++ b/ares/ares_gethostbyname.c
@@ -24,6 +24,9 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #endif
 
 #include <stdio.h>
diff --git a/ares/ares_init.c b/ares/ares_init.c
index f1e329e12..c9d1cd218 100644
--- a/ares/ares_init.c
+++ b/ares/ares_init.c
@@ -31,6 +31,9 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/ares/ares_mkquery.c b/ares/ares_mkquery.c
index fd9c369fb..d5c40cb74 100644
--- a/ares/ares_mkquery.c
+++ b/ares/ares_mkquery.c
@@ -21,6 +21,9 @@
 #else
 #include <netinet/in.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #endif
 
 #include <stdlib.h>
diff --git a/ares/ares_parse_a_reply.c b/ares/ares_parse_a_reply.c
index 296168765..8f69bf0e6 100644
--- a/ares/ares_parse_a_reply.c
+++ b/ares/ares_parse_a_reply.c
@@ -24,6 +24,9 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #endif
 
 #include <stdlib.h>
diff --git a/ares/ares_parse_ptr_reply.c b/ares/ares_parse_ptr_reply.c
index 20df4114b..2bac907db 100644
--- a/ares/ares_parse_ptr_reply.c
+++ b/ares/ares_parse_ptr_reply.c
@@ -23,6 +23,9 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #endif
 
 #include <stdlib.h>
diff --git a/ares/ares_process.c b/ares/ares_process.c
index 0190f785e..15d372642 100644
--- a/ares/ares_process.c
+++ b/ares/ares_process.c
@@ -27,6 +27,9 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/ares/ares_query.c b/ares/ares_query.c
index b39dc6d5c..47c0670eb 100644
--- a/ares/ares_query.c
+++ b/ares/ares_query.c
@@ -21,6 +21,9 @@
 #else
 #include <netinet/in.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #endif
 
 #include <stdlib.h>
diff --git a/ares/ares_send.c b/ares/ares_send.c
index 99f303966..83cea8017 100644
--- a/ares/ares_send.c
+++ b/ares/ares_send.c
@@ -21,6 +21,9 @@
 #else
 #include <netinet/in.h>
 #include <arpa/nameser.h>
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
+#endif
 #endif
 
 #include <stdlib.h>