diff --git a/CHANGES b/CHANGES
index a994c77b6a..3fa8c8dfb6 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.
+
 1284.	[bug]		Memory leak if dns_db_beginload() failed.
 
 1283.	[bug]		Reference after free error if dns_dispatchmgr_create()
diff --git a/bin/tests/zone_test.c b/bin/tests/zone_test.c
index 986fad25a1..cdc7305d02 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.26 2001/01/22 22:29:36 gson Exp $ */
+/* $Id: zone_test.c,v 1.26.2.1 2002/05/10 06:54:37 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 4eb7020a9b..3c24b5f1ed 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.43.2.1 2001/10/22 23:28:17 gson Exp $ */
+/* $Id: app.c,v 1.43.2.2 2002/05/10 06:54:38 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 8c552f6f30..32ff1a3239 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.60.2.1 2001/10/22 23:28:18 gson Exp $ */
+/* $Id: entropy.c,v 1.60.2.2 2002/05/10 06:54:40 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>