diff --git a/lib/krb5/mk_priv.c b/lib/krb5/mk_priv.c
index c7fb66a77..89664188c 100644
--- a/lib/krb5/mk_priv.c
+++ b/lib/krb5/mk_priv.c
@@ -32,8 +32,8 @@ krb5_mk_priv(krb5_context context,
     *(part.seq_number) = ++auth_context->local_seqnumber;
   } else 
     part.seq_number = NULL;
-  part.s_address.addr_type = addr.addrs[0].addr_type;
-  part.s_address.address   = addr.addrs[0].address;
+  part.s_address.addr_type = addr.val[0].addr_type;
+  part.s_address.address   = addr.val[0].address;
   part.r_address = NULL;
 
   r = encode_EncKrbPrivPart (buf + sizeof(buf) - 1, sizeof(buf), &part, &len);
diff --git a/lib/krb5/mk_safe.c b/lib/krb5/mk_safe.c
index 91b62e1aa..ce9590870 100644
--- a/lib/krb5/mk_safe.c
+++ b/lib/krb5/mk_safe.c
@@ -41,7 +41,7 @@ krb5_mk_safe(krb5_context context,
     *(s.safe_body.seq_number) = ++auth_context->local_seqnumber;
   } else 
     s.safe_body.seq_number = NULL;
-  s.safe_body.s_address = addr.addrs[0];
+  s.safe_body.s_address = addr.val[0];
   s.safe_body.r_address = NULL;
 
   r = encode_KRB_SAFE (buf + sizeof(buf) - 1, sizeof(buf), &s, &len);
diff --git a/lib/krb5/store.c b/lib/krb5/store.c
index 4452ac3b6..f11f37bbb 100644
--- a/lib/krb5/store.c
+++ b/lib/krb5/store.c
@@ -335,10 +335,10 @@ krb5_store_addrs(krb5_storage *sp, krb5_addresses p)
 {
     int i;
     int ret;
-    ret = krb5_store_int32(sp, p.number);
+    ret = krb5_store_int32(sp, p.len);
     if(ret) return ret;
-    for(i = 0; i<p.number; i++){
-	ret = krb5_store_address(sp, p.addrs[i]);
+    for(i = 0; i<p.len; i++){
+	ret = krb5_store_address(sp, p.val[i]);
 	if(ret) break;
     }
     return ret;
@@ -349,11 +349,11 @@ krb5_ret_addrs(krb5_storage *sp, krb5_addresses *adr)
 {
     int i;
     int ret;
-    ret = krb5_ret_int32(sp, &adr->number);
+    ret = krb5_ret_int32(sp, &adr->len);
     if(ret) return ret;
-    adr->addrs = ALLOC(adr->number, krb5_address);
-    for(i = 0; i < adr->number; i++){
-	ret = krb5_ret_address(sp, &adr->addrs[i]);
+    adr->val = ALLOC(adr->len, krb5_address);
+    for(i = 0; i < adr->len; i++){
+	ret = krb5_ret_address(sp, &adr->val[i]);
 	if(ret) break;
     }
     return ret;