Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -1569,10 +1569,14 @@
 			AC_DEFINE(OF_HAVE_IPX, 1, [Whether we have IPX/SPX])
 			AC_SUBST(USE_SRCS_IPX, '${SRCS_IPX}')
 		])
 	])
 
+	AC_CHECK_HEADER(netat/appletalk.h, [
+		AC_DEFINE(OF_HAVE_NETAT_APPLETALK_H, 1,
+			[Whether we have netat/appletalk.h])
+	])
 	AC_CHECK_HEADER(netatalk/at.h, [
 		AC_DEFINE(OF_HAVE_NETATALK_AT_H, 1,
 			[Whether we have netatalk/at.h])
 	])
 	AC_CHECK_MEMBER(struct sockaddr_at.sat_addr, [], [
@@ -1582,11 +1586,13 @@
 			#endif
 
 			#ifdef OF_HAVE_SYS_TYPES_H
 			# include <sys/types.h>
 			#endif
-			#ifdef OF_HAVE_NETATALK_AT_H
+			#if defined(OF_HAVE_NETAT_APPLETALK_H)
+			# include <netat/appletalk.h>
+			#elif defined(OF_HAVE_NETATALK_AT_H)
 			# include <netatalk/at.h>
 			#endif
 
 			#ifdef _WIN32
 			# ifdef __MINGW32__
@@ -1605,11 +1611,13 @@
 		#endif
 
 		#ifdef OF_HAVE_SYS_TYPES_H
 		# include <sys/types.h>
 		#endif
-		#ifdef OF_HAVE_NETATALK_AT_H
+		#if defined(OF_HAVE_NETAT_APPLETALK_H)
+		# include <netat/appletalk.h>
+		#elif defined(OF_HAVE_NETATALK_AT_H)
 		# include <netatalk/at.h>
 		#endif
 
 		#ifdef _WIN32
 		# ifdef __MINGW32__

Index: src/OFSocket.h
==================================================================
--- src/OFSocket.h
+++ src/OFSocket.h
@@ -42,11 +42,13 @@
 # include <afunix.h>
 #endif
 #ifdef OF_HAVE_NETIPX_IPX_H
 # include <netipx/ipx.h>
 #endif
-#ifdef OF_HAVE_NETATALK_AT_H
+#if defined(OF_HAVE_NETAT_APPLETALK_H)
+# include <netat/appletalk.h>
+#elif defined(OF_HAVE_NETATALK_AT_H)
 # include <netatalk/at.h>
 #endif
 
 #ifdef OF_WINDOWS
 # include <windows.h>

Index: src/objfw-defs.h.in
==================================================================
--- src/objfw-defs.h.in
+++ src/objfw-defs.h.in
@@ -16,10 +16,11 @@
 #undef OF_HAVE_IPX
 #undef OF_HAVE_LIMITS_H
 #undef OF_HAVE_LINK
 #undef OF_HAVE_MAX_ALIGN_T
 #undef OF_HAVE_NETATALK_AT_H
+#undef OF_HAVE_NETAT_APPLETALK_H
 #undef OF_HAVE_NETINET_IN_H
 #undef OF_HAVE_NETINET_TCP_H
 #undef OF_HAVE_NETIPX_IPX_H
 #undef OF_HAVE_OSATOMIC
 #undef OF_HAVE_OSATOMIC_64