diff --git a/acconfig.h b/acconfig.h
index 6413c746a..b6dba9439 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -50,8 +50,8 @@
 /*  Define this if struct utmpx have ut_exit  */
 #undef HAVE_UT_EXIT
 
-/*  Define this if you have a struct sockaddr_in6 */
-#undef HAVE_STRUCT_SOCKADDR_IN6
+/*  Define this if you have a IPv6 */
+#undef HAVE_IPV6
 
 /* define if prototype of gethostbyname is compatible with
    `struct hostent *gethostbyname(const char *)
@@ -69,7 +69,7 @@
 #undef GETSERVBYNAME_PROTO_COMPATIBLE
 
 /* define if prototype of openlog is compatible with
-   `void open(const char *, int, int)'
+   `void openlog(const char *, int, int)'
    */
 #undef OPENLOG_PROTO_COMPATIBLE
 
diff --git a/appl/telnet/telnet/commands.c b/appl/telnet/telnet/commands.c
index e0ea73389..73e4cd7f0 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_STRUCT_SOCKADDR_IN6)
+#ifdef HAVE_IPV6
     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_STRUCT_SOCKADDR_IN6)
+#ifdef HAVE_IPV6
 	memset (&sin6, 0, sizeof(sin6));
 
 	if(inet_pton(AF_INET6, hostp, &sin6.sin6_addr)) {
@@ -2158,7 +2158,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_STRUCT_SOCKADDR_IN6)
+#ifdef HAVE_IPV6
 		case AF_INET6:
 		    memset(&sin6, 0, sizeof(sin6));
 		    sa_size = sizeof(sin6);
@@ -2224,7 +2224,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_STRUCT_SOCKADDR_IN6)
+#ifdef HAVE_IPV6
     case AF_INET6: {
 #ifndef INET6_ADDRSTRLEN
 #define INET6_ADDRSTRLEN 46 
@@ -2289,7 +2289,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_STRUCT_SOCKADDR_IN6)
+#ifdef HAVE_IPV6
 		case AF_INET6: {
 		    char buf[INET6_ADDRSTRLEN];
 
diff --git a/cf/krb-ipv6.m4 b/cf/krb-ipv6.m4
index 2b4939bd3..292dc582e 100644
--- a/cf/krb-ipv6.m4
+++ b/cf/krb-ipv6.m4
@@ -39,6 +39,6 @@ struct in6_addr any = IPV6ADDR_ANY_INIT;
 ac_cv_lib_ipv6=yes,
 ac_cv_lib_ipv6=no))
 if test "$ac_cv_lib_ipv6" = yes; then
-  AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6)
+  AC_DEFINE(HAVE_IPV6)
 fi
 ])
diff --git a/kdc/connect.c b/kdc/connect.c
index d407625b6..b791174d5 100644
--- a/kdc/connect.c
+++ b/kdc/connect.c
@@ -109,7 +109,7 @@ parse_ports(char *str)
     p = strtok_r(str, " \t", &pos);
     while(p){
 	if(strcmp(p, "+") == 0) {
-#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
+#ifdef HAVE_IPV6
 	    add_standard_ports(AF_INET6);
 #else
 	    add_standard_ports(AF_INET);
@@ -118,13 +118,13 @@ parse_ports(char *str)
 	    char *q = strchr(p, '/');
 	    if(q){
 		*q++ = 0;
-#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
+#ifdef HAVE_IPV6
 		add_port(AF_INET6, p, q);
 #else
 		add_port(AF_INET, p, q);
 #endif
 	    }else {
-#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
+#ifdef HAVE_IPV6
 		add_port(AF_INET6, p, "udp");
 		add_port(AF_INET6, p, "tcp");
 #else
@@ -280,7 +280,7 @@ addr_to_string(struct sockaddr *addr, size_t addr_len, char *str, size_t len)
     case AF_INET:
 	strncpy(str, inet_ntoa(((struct sockaddr_in*)addr)->sin_addr), len);
 	break;
-#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6) && defined(HAVE_INET_NTOP)
+#if defined(HAVE_IPV6) && defined(HAVE_INET_NTOP)
     case AF_INET6 :
 	inet_ntop(AF_INET6, &((struct sockaddr_in6*)addr)->sin6_addr,
 		  str, len);
diff --git a/lib/krb5/addr_families.c b/lib/krb5/addr_families.c
index 0a12098b5..383b98fec 100644
--- a/lib/krb5/addr_families.c
+++ b/lib/krb5/addr_families.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997, 1998 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -116,7 +116,7 @@ ipv4_anyaddr (struct sockaddr *sa, int *sa_size, int port)
  * AF_INET6 - aka IPv6 implementation
  */
 
-#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
+#ifdef HAVE_IPV6
 
 static krb5_error_code
 ipv6_sockaddr2addr (const struct sockaddr *sa, krb5_address *a)
@@ -202,7 +202,7 @@ static struct addr_operations at[] = {
     {AF_INET,	KRB5_ADDRESS_INET, sizeof(struct sockaddr_in),
      ipv4_sockaddr2addr, ipv4_h_addr2sockaddr, ipv4_h_addr2addr,
      ipv4_uninteresting, ipv4_anyaddr},
-#if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
+#ifdef HAVE_IPV6
     {AF_INET6,	KRB5_ADDRESS_INET6, sizeof(struct sockaddr_in6),
      ipv6_sockaddr2addr, ipv6_h_addr2sockaddr, ipv6_h_addr2addr,
      ipv6_uninteresting, ipv6_anyaddr}