diff --git a/ChangeLog b/ChangeLog
index a90180feb..c3c6ed3a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-21  Yavor Doganov  <yavor@gnu.org>  (tiny change)
+
+	* Source/GNUmakefile.preamble (LIBRARIES_DEPEND_UPON):
+	Unconditionally link against $(OBJC_LIBS) on all platforms to
+	avoid undefined symbols.
+	Reported by Funda Wang (bug #24109).
+
 2008-08-21 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSBezierPath.m: ([transformUsingAffineTransform:]) corrected
diff --git a/Source/GNUmakefile.preamble b/Source/GNUmakefile.preamble
index a3f868a34..7d7154346 100644
--- a/Source/GNUmakefile.preamble
+++ b/Source/GNUmakefile.preamble
@@ -90,12 +90,5 @@ ADDITIONAL_INSTALL_DIRS = $(GNUSTEP_HEADERS)/AppKit $(GNUSTEP_HEADERS)/Cocoa
 # systems where building a shared library requires to pass to the linker
 # all the libraries the target library depends upon.
 
-LIBRARIES_DEPEND_UPON = -l$(FOUNDATION_LIBRARY_NAME) $(ADDITIONAL_DEPENDS)
-
-ifeq ($(GNUSTEP_TARGET_OS),mingw32)
-libgnustep-gui_LIBRARIES_DEPEND_UPON += -lobjc
-endif
-ifeq ($(GNUSTEP_TARGET_OS),cygwin)
-libgnustep-gui_LIBRARIES_DEPEND_UPON += -lobjc
-endif
-
+LIBRARIES_DEPEND_UPON = -l$(FOUNDATION_LIBRARY_NAME) $(ADDITIONAL_DEPENDS) \
+			  $(OBJC_LIBS)