diff --git a/ChangeLog b/ChangeLog
index e5950539fa..5ec402c27f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Sep 13 18:48:43 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (XLDFLAGS): link startup code with ObjC support.
+
 Sun Sep 13 13:38:00 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
 	* thread.c (recursive_*): refactored the access to the inspect
diff --git a/configure.in b/configure.in
index 1d49b058a0..b05fc2b92a 100644
--- a/configure.in
+++ b/configure.in
@@ -1892,6 +1892,7 @@ else
     when(hpux*)
 	DLEXT=sl;;
     when(nextstep*|openstep*|rhapsody*|darwin*)
+	RUBY_APPEND_OPTION(XLDFLAGS, [-Wl,-u,_objc_msgSend])
 	DLEXT=bundle;;
     when(os2-emx*)
 	LOAD_RELATIVE=1
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index d027c55677..64d8cbe00c 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -1289,8 +1289,7 @@ static char *dln_libs_to_be_linked[] = { EXTLIB, 0 };
 #endif
 
 #if (defined(__APPLE__) || defined(__NeXT__)) && defined(__MACH__)
-/* to link startup code with ObjC support */
-#define RUBY_GLOBAL_SETUP static void objcdummyfunction(void) {objc_msgSend();}
+#define RUBY_GLOBAL_SETUP /* use linker option to link startup code with ObjC support */
 #else
 #define RUBY_GLOBAL_SETUP
 #endif