diff --git a/ChangeLog b/ChangeLog
index 5b7e5fcc4..d49ac0bbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20000120
+ - Don't use getaddrinfo on AIX
+
 20000119
  - SCO compile fixes from Gary E. Miller <gem@rellim.com>
  - Compile fix from Darren_Hall@progressive.com
diff --git a/acconfig.h b/acconfig.h
index f143b1b10..0854cbc5c 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -138,6 +138,9 @@
 /* Use IPv4 for connection by default, IPv6 can still if explicity asked */
 #undef IPV4_DEFAULT
 
+/* getaddrinfo is broken (if present) */
+#undef BROKEN_GETADDRINFO
+
 @BOTTOM@
 
 /* ******************* Shouldn't need to edit below this line ************** */
diff --git a/configure.in b/configure.in
index 45df18f6d..90ed2bb80 100644
--- a/configure.in
+++ b/configure.in
@@ -55,6 +55,7 @@ dnl Check for some target-specific stuff
 case "$host" in
 *-*-aix*)
 	AFS_LIBS="-lld"
+	AC_DEFINE(BROKEN_GETADDRINFO)
 	;;
 *-*-hpux10*)
 	if test -z "$GCC"; then
diff --git a/defines.h b/defines.h
index 1a9898b28..3db1d0d95 100644
--- a/defines.h
+++ b/defines.h
@@ -247,4 +247,8 @@ typedef unsigned int size_t;
 # define PAM_STRERROR(a,b) pam_strerror((a),(b))
 #endif
 
+#if defined(BROKEN_GETADDRINFO) && defined(HAVE_GETADDRINFO)
+# undef HAVE_GETADDRINFO
+#endif /* defined(BROKEN_GETADDRINFO) && defined(HAVE_GETADDRINFO) */
+
 #endif /* _DEFINES_H */