diff --git a/ChangeLog b/ChangeLog
index 6ffcd01d7..ab8cf256c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20010104
+ - (djm) Fix memory leak on systems with BROKEN_GETADDRINFO. Based on
+   work by Chris Vaughan <vaughan99@yahoo.com>
+
 20010103
  - (bal) fixed up sshconnect.c so it was closer inline with the OpenBSD
    tree (mainly positioning)
diff --git a/defines.h b/defines.h
index 4c3941cad..45a187c19 100644
--- a/defines.h
+++ b/defines.h
@@ -348,7 +348,13 @@ struct winsize {
 
 #if defined(BROKEN_GETADDRINFO) && defined(HAVE_GETADDRINFO)
 # undef HAVE_GETADDRINFO
-#endif /* defined(BROKEN_GETADDRINFO) && defined(HAVE_GETADDRINFO) */
+#endif
+#if defined(BROKEN_GETADDRINFO) && defined(HAVE_FREEADDRINFO)
+# undef HAVE_FREEADDRINFO
+#endif
+#if defined(BROKEN_GETADDRINFO) && defined(HAVE_GAI_STRERROR)
+# undef HAVE_GAI_STRERROR
+#endif
 
 #if !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY)
 # define memmove(s1, s2, n) bcopy((s2), (s1), (n))