diff --git a/ChangeLog b/ChangeLog
index de25af23ed..f2beaf99de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jul  1 23:55:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* eval.c (PUSH_FRAME): initialize frame->self.  [ruby-dev:28911]
+
 Sat Jul  1 17:00:42 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* test/webrick/utils.rb: use Proc#yield instead of Proc#call.
@@ -12,7 +16,10 @@ Sat Jul  1 15:15:49 2006  Tanaka Akira  <akr@m17n.org>
 Fri Jun 30 23:46:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* configure.in: should test isinf for Solaris with GCC compiler.
-	  [ruby-core:08100]
+	  a patch from <ville.mattila at stonesoft.com>.  [ruby-core:07791]
+
+	* configure.in: -shared patch from Andrew Morrow
+	  <andrew.c.morrow at gmail.com>.  [ruby-core:08100]
 
 Fri Jun 30 19:35:41 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
diff --git a/configure.in b/configure.in
index a5486551e1..1c9c660d1d 100644
--- a/configure.in
+++ b/configure.in
@@ -892,10 +892,9 @@ if test "$with_dln_a_out" != yes; then
 			: ${LIBPATHENV=SHLIB_PATH}
 			rb_cv_dlopen=yes;;
 	solaris*) 	if test "$GCC" = yes; then
-			   : ${LDSHARED='$(CC) -Wl,-G'}
+                          : ${LDSHARED='$(CC) -shared'}
 			   if test "$rb_cv_prog_gnu_ld" = yes; then
 	 		       LDFLAGS="$LDFLAGS -Wl,-E"
-			       LDSHARED="$LDSHARED -shared"
 			   fi
 			else
 			   : ${LDSHARED='ld -G'}
diff --git a/eval.c b/eval.c
index 98899b5e19..7a3e2ea206 100644
--- a/eval.c
+++ b/eval.c
@@ -755,6 +755,7 @@ static unsigned long frame_unique = 1;
     _frame.tmp  = 0;			\
     _frame.node = ruby_current_node;	\
     _frame.argc = 0;			\
+    _frame.self = (link)?ruby_frame->self:0;\
     _frame.block = (link)?ruby_frame->block:0;\
     _frame.flags = 0;			\
     _frame.uniq = frame_unique++;	\