diff --git a/ChangeLog b/ChangeLog
index 13f606a9c..51364b410 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-05  Gary Houston  <ghouston@arglist.com>
+
+	* acconfig.h: add HAVE_IPV6.
+	* configure.in: check whether we can compile with IPv6 support.
+
 2001-05-04  Thien-Thi Nguyen  <ttn@revel.glug.org>
 
 	* guile-tools.in: New file.
diff --git a/acconfig.h b/acconfig.h
index fa3d8d5c7..1f14a914e 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -119,6 +119,9 @@
 /* Define if uint32_t typedef is defined when netdb.h is include.  */
 #undef HAVE_UINT32_T
 
+/* Define if you want support for IPv6.  */
+#undef HAVE_IPV6
+
 /* Define if localtime caches the TZ setting.  */
 #undef LOCALTIME_CACHE
 
diff --git a/configure.in b/configure.in
index 19b606377..8676efe63 100644
--- a/configure.in
+++ b/configure.in
@@ -287,6 +287,16 @@ if test $guile_cv_have_uint32_t = yes; then
   AC_DEFINE(HAVE_UINT32_T)
 fi
 
+AC_MSG_CHECKING(for working IPv6 support)
+AC_CACHE_VAL(guile_cv_have_ipv6,
+[AC_TRY_COMPILE([#include <netinet/in.h>],
+[struct sockaddr_in6 a;  a.sin6_family = AF_INET6;],
+guile_cv_have_ipv6=yes, guile_cv_have_ipv6=no)])
+AC_MSG_RESULT($guile_cv_have_ipv6)
+if test $guile_cv_have_ipv6 = yes; then
+  AC_DEFINE(HAVE_IPV6)
+fi
+
 # included in rfc2553 but not in older implementations, e.g., glibc 2.1.3.
 AC_MSG_CHECKING(whether sockaddr_in6 has sin6_scope_id)
 AC_CACHE_VAL(guile_cv_have_sin6_scope_id,