diff --git a/ChangeLog b/ChangeLog
index cdb4bca5..a759bec0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-05-18  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+
+	* ltconfig.in (cygwin*, whole_archive_flag_spec): dlltool chokes
+	on this, so leave it unset in this case so that the ltmain code
+	knows it has to unpack convenience archives by itself.
+
 1999-05-17  Gary V. Vaughan  <gary@oranda.demon.co.uk>
 
 	* ltmain.in: Do not exit when an unknown library name is passed
diff --git a/ltconfig.in b/ltconfig.in
index 76f89b9f..67896a28 100755
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1192,7 +1192,15 @@ EOF
     runpath_var=LD_RUN_PATH
     hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
     export_dynamic_flag_spec='${wl}--export-dynamic'
+    case $host_os in
+    cygwin* | mingw*)
+      # dlltool doesn't understand --whole-archive et. al.
+      whole_archive_flag_spec=
+      ;;
+    *)
     whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      ;;
+    esac
   fi
 else
   # PORTME fill in a description of your system's linker (not GNU ld)