diff --git a/ChangeLog b/ChangeLog
index 8d6a3abf0..74872ad35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,7 @@ Changes
 Bugfix
    * Fixed parse error in ssl_parse_certificate_request()
    * zlib compression/decompression skipped on empty blocks
+   * Support for AIX header locations in net.c module
 
 = Version 1.2.8 released 2013-06-19
 Features
diff --git a/library/net.c b/library/net.c
index da7214de3..2b21c57f1 100644
--- a/library/net.c
+++ b/library/net.c
@@ -64,10 +64,12 @@ static int wsa_init_done = 0;
 #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ||  \
     defined(__DragonflyBSD__)
 #include <sys/endian.h>
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) || defined(HAVE_MACHINE_ENDIAN_H)
 #include <machine/endian.h>
 #elif defined(sun)
 #include <sys/isa_defs.h>
+#elif defined(_AIX) || defined(HAVE_ARPA_NAMESER_COMPAT_H)
+#include <arpa/nameser_compat.h>
 #else
 #include <endian.h>
 #endif