diff --git a/src/client/dtable.c b/src/client/dtable.c
index 8f587966..3713f627 100644
--- a/src/client/dtable.c
+++ b/src/client/dtable.c
@@ -25,49 +25,24 @@
  *
  *  ---
  *
- *  dtable.c: machine-dependent descriptor table management
+ *  dtable.c: Machine-dependant descriptor table management
  * 
  *  Known contributors to this file:
  *     Steve McClure, 1998
  */
 
-#ifdef hpux
-#include <stdio.h>
+#if !defined(_WIN32)
+#include <unistd.h>
 #endif
-#ifdef _WIN32
-#include <stdio.h>
-#endif
-
-/*ARGSUSED*/
-void
-setfdtablesize(min, start)
-int min;
-int start;
-{
-#ifdef sequent
-    extern int errno;
-
-    while (start >= min) {
-	if (setdtablesize(start) < 0)
-	    break;
-	start -= 16;
-    }
-    errno = 0;
-#endif
-}
 
 int
-getfdtablesize()
+getfdtablesize(void)
 {
-#ifdef hpux
-    return _NFILE;
+#if defined(_WIN32)
+    return (_NFILE);
+#elif defined(hpux)
+    return (int)sysconf(_SC_OPEN_MAX);
 #else
-#ifdef _WIN32
-    return _NFILE;
-#else
-    int getdtablesize();
-
     return getdtablesize();
 #endif
-#endif
 }
diff --git a/src/lib/gen/dtable.c b/src/lib/gen/dtable.c
index d01a4748..35357e48 100644
--- a/src/lib/gen/dtable.c
+++ b/src/lib/gen/dtable.c
@@ -32,26 +32,10 @@
  */
 
 #if !defined(_WIN32)
-#include <unistd.h>		/* getdtablesize */
+#include <unistd.h>
 #endif
 #include "gen.h"
 
-/*ARGSUSED*/
-void
-setfdtablesize(int min, int start)
-{
-#ifdef sequent
-    extern int errno;
-
-    while (start >= min) {
-	if (setdtablesize(start) > 0)
-	    break;
-	start -= 16;
-    }
-    errno = 0;
-#endif
-}
-
 int
 getfdtablesize(void)
 {
diff --git a/src/server/main.c b/src/server/main.c
index d3c38f9c..2f4d62be 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -204,7 +204,6 @@ char *argv[];
 #else
     srand(now);
 #endif /* _WIN32 */
-    setfdtablesize(32, 256);
     global_init();
     shutdown_init();
     player_init();