diff --git a/ChangeLog b/ChangeLog
index bc90734c2c..1d0353d316 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb  4 22:51:43 2006  Tanaka Akira  <akr@m17n.org>
+
+	* eval.c: apply the FreeBSD getcontext/setcontext workaround
+	  only before FreeBSD 7-CURRENT.
+
 Sat Feb  4 21:10:06 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (LK_ERR): ERROR_NOT_LOCKED is not an error.
diff --git a/eval.c b/eval.c
index 33e82af971..4bfe133b2f 100644
--- a/eval.c
+++ b/eval.c
@@ -169,7 +169,7 @@ int function_call_may_return_twice_false_2 = 0;
        (function_call_may_return_twice_false_2 ? \
         setjmp(function_call_may_return_twice_jmp_buf) : \
         0),
-#  elif defined(__FreeBSD__)
+#  elif defined(__FreeBSD__) && __FreeBSD__ < 7
 /*
  * workaround for FreeBSD/i386 getcontext/setcontext bug.
  * clear the carry flag by (0 ? ... : ...).