diff --git a/CHANGES b/CHANGES
index 615e090033..4fd1483eef 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+ 961.	[bug]		Tried to use a IPV6 feature when ISC_PLATFORM_HAVEIPV6
+			was not defined.  [RT #1482]
+
  960.	[port]		liblwres failed to build on systems with support for
 			getrrsetbyname() in the OS.  [RT #1592]
 
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 7c6de10971..81c1d73980 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.206 2001/08/12 00:12:14 marka Exp $ */
+/* $Id: socket.c,v 1.207 2001/08/16 07:27:48 marka Exp $ */
 
 #include <config.h>
 
@@ -650,7 +650,7 @@ build_msghdr_send(isc_socket_t *sock, isc_socketevent_t *dev,
 	msg->msg_control = NULL;
 	msg->msg_controllen = 0;
 	msg->msg_flags = 0;
-#ifdef USE_CMSG
+#if defined(USE_CMSG) && defined(ISC_PLATFORM_HAVEIPV6)
 	if ((sock->type == isc_sockettype_udp)
 	    && ((dev->attributes & ISC_SOCKEVENTATTR_PKTINFO) != 0)) {
 		struct cmsghdr *cmsgp;
@@ -671,7 +671,7 @@ build_msghdr_send(isc_socket_t *sock, isc_socketevent_t *dev,
 		pktinfop = (struct in6_pktinfo *)CMSG_DATA(cmsgp);
 		memcpy(pktinfop, &dev->pktinfo, sizeof(struct in6_pktinfo));
 	}
-#endif /* USE_CMSG */
+#endif /* USE_CMSG && ISC_PLATFORM_HAVEIPV6 */
 #else /* ISC_NET_BSD44MSGHDR */
 	msg->msg_accrights = NULL;
 	msg->msg_accrightslen = 0;