diff --git a/configure b/configure
index 5790a3219c..2ba6050bce 100755
--- a/configure
+++ b/configure
@@ -19085,6 +19085,16 @@ esac
 
 fi
 
+# Cygwin's erand48 sometimes hangs, so force use of ours
+if test "$PORTNAME" = "cygwin"; then
+  case " $LIBOBJS " in
+  *" erand48.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS erand48.$ac_objext"
+ ;;
+esac
+
+fi
+
 # Win32 support
 if test "$PORTNAME" = "win32"; then
 
diff --git a/configure.in b/configure.in
index c713e54364..6b663c1d75 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.605 2009/07/16 17:43:52 tgl Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.606 2009/07/23 23:50:29 adunstan Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -1289,6 +1289,11 @@ if test "$PORTNAME" = "solaris"; then
   AC_LIBOBJ(getopt)
 fi
 
+# Cygwin's erand48 sometimes hangs, so force use of ours
+if test "$PORTNAME" = "cygwin"; then
+  AC_LIBOBJ(erand48)
+fi
+
 # Win32 support
 if test "$PORTNAME" = "win32"; then
 AC_REPLACE_FUNCS(gettimeofday)