diff --git a/CHANGES b/CHANGES
index 9bdf3fd2c2..3abd6ae9ed 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1998.	[bug]		Restrict handling of fifos as sockets to just SunOS.
+			This allows named to connect to entropy gathering
+			daemons that use fifos instead of sockets. [RT #15840]
+
 1997.	[bug]		Named was failing to replace negative cache entries
 			when a positive one for the type was learnt.
 			[RT #15818]
diff --git a/lib/isc/unix/entropy.c b/lib/isc/unix/entropy.c
index 2fe3bab27f..e3a3a201f4 100644
--- a/lib/isc/unix/entropy.c
+++ b/lib/isc/unix/entropy.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: entropy.c,v 1.76 2006/01/06 00:01:44 marka Exp $ */
+/* $Id: entropy.c,v 1.77 2006/03/02 23:25:05 marka Exp $ */
 
 /* \file unix/entropy.c
  * \brief
@@ -504,7 +504,7 @@ isc_entropy_createfilesource(isc_entropy_t *ent, const char *fname) {
 	if (S_ISSOCK(_stat.st_mode))
 		is_usocket = ISC_TRUE;
 #endif
-#if defined(S_ISFIFO)
+#if defined(S_ISFIFO) && defined(sun)
 	if (S_ISFIFO(_stat.st_mode))
 		is_usocket = ISC_TRUE;
 #endif