diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 9ff33694904fced579be854219389dbc13d33248..d680cfb7d519a50b7a2a6a9de4b268fefe3c2b5f 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -29,7 +29,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: pqcomm.c,v 1.112 2000/11/14 01:15:00 momjian Exp $
+ *	$Id: pqcomm.c,v 1.113 2000/11/21 23:03:53 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -411,10 +411,10 @@ StreamConnection(int server_fd, Port *port)
 		return STATUS_ERROR;
 	}
 
-#ifdef PG_ON_UNIXWARE
+#ifdef SCO_ACCEPT_BUG
 	/*
-	 * Only UnixWare 7+ are known to have this bug, but it shouldn't
-	 * hurt it catch if for all of them.
+	 * UnixWare 7+ and OpenServer 5.0.4 are known to have this bug,
+	 * but it shouldn't hurt it catch if for all of them.
 	 */
 	if (port->raddr.sa.sa_family == 0)
 		port->raddr.sa.sa_family = AF_UNIX;
diff --git a/src/include/port/sco.h b/src/include/port/sco.h
index b37990c3dd9ddfb03eeb83e5c1b2ff5c73d4b82e..1e08b5b8a5c569f9e135caa5b6905d8d3280e47b 100644
--- a/src/include/port/sco.h
+++ b/src/include/port/sco.h
@@ -4,6 +4,9 @@
 
 #define DISABLE_COMPLEX_MACRO
 
+/* see src/backend/libpq/pqcomm.c */
+#define SCO_ACCEPT_BUG
+
 #define HAS_TEST_AND_SET
 #define NEED_I386_TAS_ASM
 
diff --git a/src/include/port/unixware.h b/src/include/port/unixware.h
index 76d5f26d88be7871a9547ca2a32bea1a8f943f61..7a622c83a994d1524b28b477c28db96763ccd5a5 100644
--- a/src/include/port/unixware.h
+++ b/src/include/port/unixware.h
@@ -2,7 +2,7 @@
 #define NEED_I386_TAS_ASM
 
 /* see src/backend/libpq/pqcomm.c */
-#define PG_ON_UNIXWARE
+#define SCO_ACCEPT_BUG
 
 /***************************************
  * Define this if you are compiling with