diff --git a/ChangeLog b/ChangeLog
index e1a3be5a37..f6d752f3af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jul  5 01:24:26 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* cont.c: disable FIBER_USE_NATIVE on Solaris because resuming any
+	  Fiber caused SEGV.  I haven't follow up the issue deeply, but it
+	  works when disabling the feature.
+
 Tue Jul  5 01:22:46 2011  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* addr2line.c: include <alloca.h> to fix a build issue on Solaris.
diff --git a/cont.c b/cont.c
index cdbe5909c5..aa144ce619 100644
--- a/cont.c
+++ b/cont.c
@@ -15,7 +15,7 @@
 #include "gc.h"
 #include "eval_intern.h"
 
-#if ((defined(_WIN32) && _WIN32_WINNT >= 0x0400) || defined(HAVE_SETCONTEXT)) && !defined(__NetBSD__) && !defined(FIBER_USE_NATIVE)
+#if ((defined(_WIN32) && _WIN32_WINNT >= 0x0400) || defined(HAVE_SETCONTEXT)) && !defined(__NetBSD__) && !defined(sun) && !defined(FIBER_USE_NATIVE)
 #define FIBER_USE_NATIVE 1
 
 /* FIBER_USE_NATIVE enables Fiber performance improvement using system