diff --git a/CHANGES b/CHANGES
index 7923d11b31..cea286b590 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1288.	[port]		Openserver: the value FD_SETSIZE depends on whether
+			<sys/param.h> is included or not.  Be consistant.
+
 1287.	[func]		isc_file_openunique() now creates file using mode
 			0666 rather than 0600.
 
diff --git a/bin/tests/zone_test.c b/bin/tests/zone_test.c
index 766479b387..cdc463ecb6 100644
--- a/bin/tests/zone_test.c
+++ b/bin/tests/zone_test.c
@@ -15,10 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone_test.c,v 1.27 2001/11/27 01:55:30 gson Exp $ */
+/* $Id: zone_test.c,v 1.28 2002/05/10 06:41:53 marka Exp $ */
 
 #include <config.h>
 
+#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>
 
@@ -41,6 +42,10 @@
 #include <dns/result.h>
 #include <dns/zone.h>
 
+#ifdef ISC_PLATFORM_NEEDSYSSELECTH
+#include <sys/select.h>
+#endif
+
 static int debug = 0;
 static int quiet = 0;
 static int stats = 0;
diff --git a/lib/isc/unix/app.c b/lib/isc/unix/app.c
index a6ca208113..9a4dd0a902 100644
--- a/lib/isc/unix/app.c
+++ b/lib/isc/unix/app.c
@@ -15,10 +15,11 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: app.c,v 1.47 2001/11/30 01:59:40 gson Exp $ */
+/* $Id: app.c,v 1.48 2002/05/10 06:41:54 marka Exp $ */
 
 #include <config.h>
 
+#include <sys/param.h>	/* Openserver 5.0.6A and FD_SETSIZE */
 #include <sys/types.h>
 
 #include <stddef.h>
diff --git a/lib/isc/unix/entropy.c b/lib/isc/unix/entropy.c
index 2a21bfd69e..3129ce6af8 100644
--- a/lib/isc/unix/entropy.c
+++ b/lib/isc/unix/entropy.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: entropy.c,v 1.64 2002/03/05 06:41:08 marka Exp $ */
+/* $Id: entropy.c,v 1.65 2002/05/10 06:41:55 marka Exp $ */
 
 /*
  * This is the system depenedent part of the ISC entropy API.
@@ -23,6 +23,7 @@
 
 #include <config.h>
 
+#include <sys/param.h>	/* Openserver 5.0.6A and FD_SETSIZE */
 #include <sys/types.h>
 #include <sys/time.h>