diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 412f53cfae..eb03bbf172 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.46 1997/05/25 15:37:15 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.47 1997/07/30 14:03:33 scrappy Exp $
  *
  * NOTES
  *
@@ -34,7 +34,7 @@
  */
                                 /* moved here to prevent double define */
 #include <sys/param.h>          /* for MAXHOSTNAMELEN on most */
-#ifndef MAXHOSTNAMELEN
+#ifdef HAVE_NETDB_H
 #include <netdb.h>              /* for MAXHOSTNAMELEN on some */
 #endif
 
diff --git a/src/configure b/src/configure
index 46a882253b..36840ca3e3 100755
--- a/src/configure
+++ b/src/configure
@@ -2688,7 +2688,7 @@ else
 fi
 done
 
-for ac_hdr in sys/resource.h
+for ac_hdr in sys/resource.h netdb.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/src/configure.in b/src/configure.in
index 428437dde5..8e63852b26 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -376,7 +376,7 @@ dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(limits.h unistd.h termios.h values.h sys/select.h)
-AC_CHECK_HEADERS(sys/resource.h)
+AC_CHECK_HEADERS(sys/resource.h netdb.h)
 AC_CHECK_HEADERS(readline.h history.h dld.h crypt.h endian.h float.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
diff --git a/src/include/config.h.in b/src/include/config.h.in
index 8e5b194145..da9122aee2 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -14,6 +14,9 @@
  * The following is set using configure.  
  */
 
+/* Set to 1 if you have <netdb.h> */
+#undef HAVE_NETDB_H
+
 /* Set to 1 if you have <endian.h> */
 #undef HAVE_ENDIAN_H