@@ -128,13 +128,14 @@
 
 		[OFStdOut writeFormat: @"%@(", name];
 
 		if (etherAddr.itemSize == 1 && etherAddr.count == 6) {
 			const unsigned char *addr = etherAddr.items;
-			[OFStdOut writeFormat: @"%02X:%02X:%02X:%02X:%02X:%02X",
-					       addr[0], addr[1], addr[2],
-					       addr[3], addr[4], addr[5]];
+			[OFStdOut writeFormat:
+			    @"MAC=%02X:%02X:%02X:%02X:%02X:%02X",
+			    addr[0], addr[1], addr[2], addr[3], addr[4],
+			    addr[5]];
 			firstAddress = false;
 		}
 
 		addrs = [interface objectForKey: OFNetworkInterfaceAddresses];
 		for (size_t i = 0; i < addrs.count; i++) {
@@ -148,10 +149,27 @@
 			}
 
 			if (!firstAddress)
 				[OFStdOut writeString: @", "];
 			firstAddress = nil;
+
+			switch (addr->family) {
+			case OFSocketAddressFamilyIPv4:
+				[OFStdOut writeString: @"IPv4="];
+				break;
+			case OFSocketAddressFamilyIPv6:
+				[OFStdOut writeString: @"IPv6="];
+				break;
+			case OFSocketAddressFamilyIPX:
+				[OFStdOut writeString: @"IPX="];
+				break;
+			case OFSocketAddressFamilyAppleTalk:
+				[OFStdOut writeString: @"AppleTalk="];
+				break;
+			default:
+				[OFStdOut writeString: @"unknown="];
+			}
 
 			[OFStdOut writeString: string];
 		}
 
 		[OFStdOut writeString: @")"];