diff --git a/CHANGES b/CHANGES
index d7cde18038..a07a7ba8a8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1217.	[port]		linux: make handling EINVAL from socket() no longer
+			conditional on #ifdef LINUX.
+
 1216.	[bug]		isc_log_closefilelogs() needed to lock the log
 			context.
 
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index 042688f34a..189f9d2349 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.226 2002/05/27 00:40:22 marka Exp $ */
+/* $Id: socket.c,v 1.227 2002/06/03 06:31:16 marka Exp $ */
 
 #include <config.h>
 
@@ -1338,13 +1338,11 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
 		case EPROTONOSUPPORT:
 		case EPFNOSUPPORT:
 		case EAFNOSUPPORT:
-#ifdef LINUX
 		/*
 		 * Linux 2.2 (and maybe others) return EINVAL instead of
 		 * EAFNOSUPPORT.
 		 */
 		case EINVAL:
-#endif
 			return (ISC_R_FAMILYNOSUPPORT);
 
 		default: