diff --git a/config.h.in b/config.h.in
index 0139996..59fb109 100644
--- a/config.h.in
+++ b/config.h.in
@@ -156,5 +156,8 @@
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
+/* Define to a way to access the inner bytes of an ip6 address */
+#undef s6_addr32
+
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
diff --git a/config/int_ghba_r.c b/config/int_ghba_r.c
index b6caac5..f80b6ff 100644
--- a/config/int_ghba_r.c
+++ b/config/int_ghba_r.c
@@ -6,6 +6,7 @@
 
 static const char rcsid[] = "$Id: int_ghba_r.c,v 1.1 2002/11/04 12:27:35 chris Exp $";
 
+#include <sys/socket.h>
 #include <sys/types.h>
 
 #include <errno.h>
diff --git a/configure.in b/configure.in
index 8f2e779..2780fa4 100644
--- a/configure.in
+++ b/configure.in
@@ -81,6 +81,14 @@ AC_C_CONST
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
 
+dnl At least FeeBSD doesn't define s6_addr32 in user-land code, with a
+dnl note saying this is not standard
+AC_CHECK_DECL([s6_addr32],
+	[],
+	[AC_DEFINE([s6_addr32], [__u6_addr.__u6_addr32],
+	 [Define to a way to access the inner bytes of an ip6 address.])],
+	[#include <netinet/in.h>])
+
 dnl
 dnl Are we on a system that uses the STREAMS low-level DLPI interface?
 dnl