diff --git a/ChangeLog b/ChangeLog
index 82d7261d27..125dd45679 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Nov 27 04:57:11 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (--no-undefined): r33840 breaks FreeBSD with gcc47.
+	  FreeBSD's environ is in /usr/libexec/ld-elf.so.1, so it will be
+	  false negative.
+
 Sun Nov 27 04:55:45 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/net/http.rb (Net::HTTP::SSL_IVNAMES): rerefix 33701.
diff --git a/configure.in b/configure.in
index 4b7fb581c9..e051cb6cfe 100644
--- a/configure.in
+++ b/configure.in
@@ -2267,9 +2267,13 @@ AS_CASE("$enable_shared", [yes], [
     SOLIBS='$(LIBS)'
   fi
 
-  if test "$GCC" = yes; then
-    RUBY_TRY_LDFLAGS([-Xlinker --no-undefined], RUBY_APPEND_OPTION(EXTLDFLAGS, [-Xlinker --no-undefined]))
-  fi
+  AS_CASE(["$target_os"],
+    [freebsd*], ,
+    [
+     if test "$GCC" = yes; then
+       RUBY_TRY_LDFLAGS([-Xlinker --no-undefined], RUBY_APPEND_OPTION(EXTLDFLAGS, [-Xlinker --no-undefined]))
+     fi
+    ])
 
   AS_CASE(["$target_os"],
     [sunos4*], [