diff --git a/ChangeLog b/ChangeLog
index 3bbf227..969c871 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-05  Christian Biesinger  <cbiesinger@web.de>
+        reviewed by: plam & keithp
+
+        * src/Makefile.am:
+
+        Use libtool -no-undefined flag on all platforms.
+
 2005-10-05  Patrick Lam  <plam@mit.edu>
 	* src/fccache.c (FcCacheHaveBank):
 
diff --git a/src/Makefile.am b/src/Makefile.am
index db2d8ef..8247b97 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,6 @@
 
 if OS_WIN32
 
-no_undefined = -no-undefined
 export_symbols = -export-symbols fontconfig.def
 
 # gcc import library install/uninstall
@@ -101,7 +100,7 @@ libfontconfig_la_SOURCES = \
 lib_LTLIBRARIES = libfontconfig.la
 
 libfontconfig_la_LDFLAGS =			\
-	-version-info @LT_VERSION_INFO@ $(no_undefined) $(export_symbols)
+	-version-info @LT_VERSION_INFO@ -no_undefined $(export_symbols)
 
 libfontconfig_la_LIBADD = $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS)