diff --git a/lib/krb5/get_addrs.c b/lib/krb5/get_addrs.c
index eea91682f..e6bce542f 100644
--- a/lib/krb5/get_addrs.c
+++ b/lib/krb5/get_addrs.c
@@ -168,6 +168,10 @@ find_all_addresses (krb5_context context,
 #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
 	 sz = max(sz, sizeof(ifr->ifr_name) + sa->sa_len);
 #endif
+#ifdef AF_INET6
+	 if (sa->sa_family == AF_INET6)
+	     sz = max(sz, sizeof(ifr->ifr_name) + sizeof(struct sockaddr_in6));
+#endif
 
 	 memcpy (ifreq.ifr_name, ifr->ifr_name, sizeof(ifr->ifr_name));