diff --git a/ChangeLog b/ChangeLog
index b4bbe7b9b4..96d81fe5e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Oct 29 13:02:17 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in (rb_cv_lib_xpg4_needed): Drop legacy FreeBSD
+	  support regarding libxpg4.  Those old versions of FreeBSD
+	  shipped with the library don't have a working pthread library
+	  anyway.
+
 Wed Oct 29 11:50:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (dln-a-out): cannot make shared library nor work with
diff --git a/configure.in b/configure.in
index 83e76711df..c6d43c139d 100644
--- a/configure.in
+++ b/configure.in
@@ -608,21 +608,6 @@ bsdi*)          LIBS="-lm $LIBS"
 		AC_DEFINE(BROKEN_SETREGID, 1)
                 ac_cv_sizeof_rlim_t=8;;
 freebsd*)	LIBS="-lm $LIBS"
-		AC_CACHE_CHECK([whether -lxpg4 has to be linked],
-		  rb_cv_lib_xpg4_needed,
-		  [AC_TRY_CPP([
-#include <osreldate.h>
-#if __FreeBSD_version < 400020 || \
-   (__FreeBSD_version >= 500000 && __FreeBSD_version < 500005)
-#error needs libxpg4
-#endif
-		   ],
-		   rb_cv_lib_xpg4_needed=no,
-		   rb_cv_lib_xpg4_needed=yes,
-		   rb_cv_lib_xpg4_needed=yes)])
-		if test "$rb_cv_lib_xpg4_needed" = yes; then
-			AC_CHECK_LIB(xpg4, setlocale)
-		fi
 		;;
 dragonfly*)	LIBS="-lm $LIBS"
 		;;