diff --git a/appl/telnet/telnet/commands.c b/appl/telnet/telnet/commands.c
index 129e8f29d..40f85f492 100644
--- a/appl/telnet/telnet/commands.c
+++ b/appl/telnet/telnet/commands.c
@@ -2029,7 +2029,7 @@ int
 tn(int argc, char **argv)
 {
     struct hostent *host = 0;
-#if defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6)
+#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
     struct sockaddr_in6 sin6;
 #endif
     struct sockaddr_in sin;
@@ -2121,7 +2121,7 @@ tn(int argc, char **argv)
     } else {
 #endif
 	memset (&sin, 0, sizeof(sin));
-#if defined(HAVE_INET_PTON) && defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6)
+#if defined(HAVE_INET_PTON) && defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
 	memset (&sin6, 0, sizeof(sin6));
 
 	if(inet_pton(AF_INET6, hostp, &sin6.sin6_addr)) {
@@ -2154,7 +2154,7 @@ tn(int argc, char **argv)
 		    sin.sin_family = family;
 		    sin.sin_addr   = *((struct in_addr *)(*host->h_addr_list));
 		    break;
-#if defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6)
+#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
 		case AF_INET6:
 		    memset(&sin6, 0, sizeof(sin6));
 		    sa_size = sizeof(sin6);
@@ -2220,7 +2220,7 @@ tn(int argc, char **argv)
 	sin.sin_port = port;
 	printf("Trying %s...\r\n", inet_ntoa(sin.sin_addr));
 	break;
-#if defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6)
+#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
     case AF_INET6: {
 	char buf[INET6_ADDRSTRLEN];
 
@@ -2281,7 +2281,7 @@ tn(int argc, char **argv)
 			    inet_ntoa(sin.sin_addr));
 		    sin.sin_addr = *((struct in_addr *)(*++host->h_addr_list));
 		    break;
-#if defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6)
+#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
 		case AF_INET6: {
 		    char buf[INET6_ADDRSTRLEN];