diff --git a/src/ChangeLog b/src/ChangeLog
index 9e7cd444..59811c13 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-12  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* connect.c (bind_local): Don't set the IPV6_V6ONLY option on the
+	socket.
+
 2003-12-06  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* url.c (url_file_name): Respect the setting of
diff --git a/src/connect.c b/src/connect.c
index e2bacf40..fd3bbb92 100644
--- a/src/connect.c
+++ b/src/connect.c
@@ -428,13 +428,6 @@ bind_local (const ip_address *bind_address, int *port)
   setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, setopt_ptr, setopt_size);
 #endif
 
-#ifdef ENABLE_IPV6
-# ifdef HAVE_IPV6_V6ONLY
-  if (family == AF_INET6)
-    setsockopt (sock, IPPROTO_IPV6, IPV6_V6ONLY, setopt_ptr, setopt_size);
-# endif
-#endif
-
   xzero (ss);
   sockaddr_set_data (sa, bind_address, *port);
   if (bind (sock, sa, sockaddr_size (sa)) < 0)