diff --git a/lib/krb5/address.c b/lib/krb5/address.c
index 7c3533e58..ebe407406 100644
--- a/lib/krb5/address.c
+++ b/lib/krb5/address.c
@@ -32,25 +32,31 @@ krb5_address_search(krb5_context context,
     return FALSE;
 }
 
-krb5_boolean
-krb5_address_compare(krb5_context context,
-		     const krb5_address *addr1,
-		     const krb5_address *addr2)
-{
-  return addr1->addr_type == addr2->addr_type
-    && memcmp (addr1->address.data,
-	       addr2->address.data,
-	       addr1->address.length) == 0;
-}
-
 int
 krb5_address_order(krb5_context context,
 		   const krb5_address *addr1,
 		   const krb5_address *addr2)
 {
-  abort ();
+    return (addr1->addr_type - addr2->addr_type)
+	|| memcmp (addr1->address.data,
+		   addr2->address.data,
+		   addr1->address.length);
 }
 
+krb5_boolean
+krb5_address_compare(krb5_context context,
+		     const krb5_address *addr1,
+		     const krb5_address *addr2)
+{
+    return krb5_address_order (context, addr1, addr2) == 0;
+}
+#if 0
+  return addr1->addr_type == addr2->addr_type
+    && memcmp (addr1->address.data,
+	       addr2->address.data,
+	       addr1->address.length) == 0;
+#endif
+
 krb5_error_code
 krb5_copy_address(krb5_context context,
 		  const krb5_address *inaddr,