diff --git a/weechat/configure.in b/weechat/configure.in

index 7a6fe93..b81234d 100644

--- a/weechat/configure.in

+++ b/weechat/configure.in

@@ -378,10 +378,11 @@ if test "x$enable_ruby" = "xyes" ; then

         not_found="$not_found ruby"

     else

 	RUBY_VERSION=`$RUBY -rrbconfig -e "puts Config::CONFIG[['ruby_version']]"`

-        RUBY_INCLUDE=`$RUBY -rrbconfig -e "puts Config::CONFIG[['archdir']]"`

+        RUBY_INCLUDE=`$RUBY -rrbconfig -e "puts Config::CONFIG[['rubyhdrdir']]"`

+        RUBY_ARCH=`$RUBY -rrbconfig -e "puts Config::CONFIG[['arch']]"`

         AC_MSG_CHECKING(for Ruby header files)

         if test -r "$RUBY_INCLUDE/ruby.h"; then

-            RUBY_CFLAGS="-I$RUBY_INCLUDE"

+            RUBY_CFLAGS="-I$RUBY_INCLUDE/$RUBY_ARCH -I$RUBY_INCLUDE/ruby/backward -I$RUBY_INCLUDE"

         else

             AC_MSG_WARN([

 *** Ruby header files couldn't be found in your system.

diff --git a/weechat/src/plugins/scripts/ruby/weechat-ruby.c b/weechat/src/plugins/scripts/ruby/weechat-ruby.c

index c50d51e..7858fdb 100644

--- a/weechat/src/plugins/scripts/ruby/weechat-ruby.c

+++ b/weechat/src/plugins/scripts/ruby/weechat-ruby.c

@@ -2666,7 +2666,7 @@ weechat_plugin_init (t_weechat_plugin *plugin)

     rb_eval_string_protect(weechat_ruby_code, &ruby_error);

     if (ruby_error) {	

-	VALUE ruby_error_info = rb_inspect(ruby_errinfo);

+	VALUE ruby_error_info = rb_inspect(rb_errinfo());

 	ruby_plugin->print_server (ruby_plugin,

                                    "Ruby error: unable to eval weechat ruby internal code");

 	ruby_plugin->print_server (ruby_plugin,