diff --git a/configure b/configure
index ddbda1cddf..379dab16ab 100755
--- a/configure
+++ b/configure
@@ -12067,7 +12067,7 @@ esac
 
 fi
 
-# Win32 support
+# Win32 (really MinGW) support
 if test "$PORTNAME" = "win32"; then
   ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
 if test "x$ac_cv_func_gettimeofday" = xyes; then :
@@ -12154,6 +12154,16 @@ else
 
 fi
 
+# Cygwin needs only a bit of that
+if test "$PORTNAME" = "cygwin"; then
+  case " $LIBOBJS " in
+  *" dirmod.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS dirmod.$ac_objext"
+ ;;
+esac
+
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigsetjmp" >&5
 $as_echo_n "checking for sigsetjmp... " >&6; }
 if ${pgac_cv_func_sigsetjmp+:} false; then :
diff --git a/configure.in b/configure.in
index a023727eba..ca29e93eee 100644
--- a/configure.in
+++ b/configure.in
@@ -1436,7 +1436,7 @@ if test "$PORTNAME" = "win32"; then
   AC_LIBOBJ(getopt_long)
 fi
 
-# Win32 support
+# Win32 (really MinGW) support
 if test "$PORTNAME" = "win32"; then
   AC_REPLACE_FUNCS(gettimeofday)
   AC_LIBOBJ(dirmod)
@@ -1460,6 +1460,11 @@ else
   AC_SUBST(have_win32_dbghelp,no)
 fi
 
+# Cygwin needs only a bit of that
+if test "$PORTNAME" = "cygwin"; then
+  AC_LIBOBJ(dirmod)
+fi
+
 dnl Cannot use AC_CHECK_FUNC because sigsetjmp may be a macro
 dnl (especially on GNU libc)
 dnl See also comments in c.h.