diff --git a/ChangeLog b/ChangeLog
index f51967e9a510dc922ad5d86646c2580305d5a4c9..6eab821388994fe8967b2b3e0f1875ef455f3338 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-23  Niels Möller  <nisse@lysator.liu.se>
+
+	* configure.ac (SHLIBLINK, SHLIBLIBS): On cygwin, linking needs
+	-Wl,--whole-archive $(OBJECTS) -Wl,--no-whole-archive $(LIBS). 
+
 2004-09-22  Niels Möller  <niels@s3.kth.se>
 
 	* configure.ac: Setup SHLIBFORLINK and friends for cygwin. 
diff --git a/configure.ac b/configure.ac
index 5c6e14762889524dc61859c11623bf0a67a3cc78..f225467f309d49d69682a9bd6fe144d483d717b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,8 +125,8 @@ case `uname -sr` in
     SHLIBFORLINK='cygnettle-$(SHLIBMAJOR)-$(SHLIBMINOR).dll'
     SHLIBSONAME=''
     SHLIBFILE='libnettle.dll.a'
-    SHLIBLINK='$(CC) $(LDFLAGS) -shared -Wl,--out-implib=$(SHLIBFILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--no-whole-archive'
-    SHLIBLIBS='$(LIBS)'
+    SHLIBLINK='$(CC) $(LDFLAGS) -shared -Wl,--out-implib=$(SHLIBFILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive'
+    SHLIBLIBS='-Wl,--no-whole-archive $(LIBS)'
     ;;
   *)
     SHLIBFORLINK=libnettle.so