@@ -135,14 +135,20 @@
     NSSearchPathEnumerationState, char *);
 #endif
 
 #ifdef OF_HAVE_SOCKETS
 OFNetworkInterfaceKey OFNetworkInterfaceIndex = @"OFNetworkInterfaceIndex";
+# ifdef OF_HAVE_IPV6
 OFNetworkInterfaceKey OFNetworkInterfaceIPv6Addresses =
     @"OFNetworkInterfaceIPv6Addresses";
+# endif
 OFNetworkInterfaceKey OFNetworkInterfaceIPv4Addresses =
     @"OFNetworkInterfaceIPv4Addresses";
+# ifdef OF_HAVE_APPLETALK
+OFNetworkInterfaceKey OFNetworkInterfaceAppleTalkAddresses =
+    @"OFNetworkInterfaceAppleTalkAddresses";
+# endif
 #endif
 
 #if defined(OF_AMD64) || defined(OF_X86)
 struct X86Regs {
 	uint32_t eax, ebx, ecx, edx;
@@ -966,14 +972,15 @@
 
 	return true;
 }
 # endif
 
+# ifdef OF_HAVE_IPV6
 static bool
 queryNetworkInterfaceIPv6Addresses(OFMutableDictionary *ret)
 {
-# if defined(OF_LINUX) && defined(OF_HAVE_FILES)
+#  if defined(OF_LINUX) && defined(OF_HAVE_FILES)
 	OFFile *file;
 	OFString *line;
 	OFMutableDictionary *interface;
 	OFEnumerator *enumerator;
 
@@ -1046,18 +1053,19 @@
 	while ((interface = [enumerator nextObject]) != nil)
 		[[interface objectForKey: OFNetworkInterfaceIPv4Addresses]
 		    makeImmutable];
 
 	return false;
-# elif defined(HAVE_IOCTL) && defined(HAVE_NET_IF_H)
+#  elif defined(HAVE_IOCTL) && defined(HAVE_NET_IF_H)
 	return queryNetworkInterfaceAddresses(ret,
 	    OFNetworkInterfaceIPv6Addresses, OFSocketAddressFamilyIPv6,
 	    AF_INET6, sizeof(struct sockaddr_in6));
-# else
+#  else
 	return false;
-# endif
+#  endif
 }
+# endif
 
 static bool
 queryNetworkInterfaceIPv4Addresses(OFMutableDictionary *ret)
 {
 # if defined(HAVE_IOCTL) && defined(HAVE_NET_IF_H)
@@ -1066,10 +1074,25 @@
 	    AF_INET, sizeof(struct sockaddr_in));
 # else
 	return false;
 # endif
 }
+
+# ifdef OF_HAVE_APPLETALK
+static bool
+queryNetworkInterfaceAppleTalkAddresses(OFMutableDictionary *ret)
+{
+#  if defined(HAVE_IOCTL) && defined(HAVE_NET_IF_H)
+	return queryNetworkInterfaceAddresses(ret,
+	    OFNetworkInterfaceAppleTalkAddresses,
+	    OFSocketAddressFamilyAppleTalk, AF_APPLETALK,
+	    sizeof(struct sockaddr_at));
+#  else
+	return false;
+#  endif
+}
+# endif
 
 + (OFDictionary OF_GENERIC(OFString *, OFNetworkInterface) *)networkInterfaces
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFMutableDictionary *ret = [OFMutableDictionary dictionary];
@@ -1076,12 +1099,17 @@
 	bool success = false;
 	OFEnumerator *enumerator;
 	OFMutableDictionary *interface;
 
 	success |= queryNetworkInterfaceIndices(ret);
+# ifdef OF_HAVE_IPV6
 	success |= queryNetworkInterfaceIPv6Addresses(ret);
+# endif
 	success |= queryNetworkInterfaceIPv4Addresses(ret);
+# ifdef OF_HAVE_APPLETALK
+	success |= queryNetworkInterfaceAppleTalkAddresses(ret);
+# endif
 
 	if (!success) {
 		objc_autoreleasePoolPop(pool);
 		return nil;
 	}