diff --git a/ChangeLog b/ChangeLog
index 593b116a1..5a7f9c369 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2008-09-15 Lionel Sainte Cluque
-  * src/Makefile.am: Add $(DESTDIR) in tclspice installation, required by
-  debian package.
+  * src/Makefile.am: Add $(DESTDIR) in tclspice installation, required by debian package.
+  * src/Makefile.am: Use -no-undefined only for windows build (libspice_la_LDFLAGS)
 
 2008-09-13 Holger Vogt
  * configure.in: add AC_LIBTOOL_WIN32_DLL
diff --git a/src/Makefile.am b/src/Makefile.am
index 8afc48ba2..76d8f639b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -267,7 +267,10 @@ libspice_la_LIBADD = ngspice.lo conf.lo \
 	misc/libmisc.la \
 	tclspice.lo $(LIBS) 
 libspice_la_CFLAGS = $(AM_CFLAGS)
-libspice_la_LDFLAGS =  -shared -Wl,--version-script=tclspice.map -no-undefined
+libspice_la_LDFLAGS =  -shared -Wl,--version-script=tclspice.map 
+if WINDOWS
+libspice_la_LDFLAGS +=  -no-undefined
+endif
 
 CLEANFILES = pkgIndex.tcl libspice.so