diff --git a/lib/kross/configure.in.in b/lib/kross/configure.in.in
index f12c24c7c..4af2a49af 100644
--- a/lib/kross/configure.in.in
+++ b/lib/kross/configure.in.in
@@ -36,7 +36,7 @@ if test "x$compile_kross" = "xyes" ; then
         RUBY_CFLAGS=`$PKGCONFIG ruby --cflags`
       fi
       if test -z "$RUBY_VERSION"; then
-        for RUBY_TEST in 2.3 2.2 2.1 2.0 1.9; do
+        for RUBY_TEST in 2.5 2.4 2.3 2.2 2.1 2.0 1.9; do
           RUBY_VERSION=`$PKG_CONFIG ruby-$RUBY_TEST --modversion 2>/dev/null`
           if test -n "$RUBY_VERSION"; then
             RUBY_CFLAGS=`$PKG_CONFIG ruby-$RUBY_TEST --cflags`
diff --git a/lib/kross/ruby/rubyscript.cpp b/lib/kross/ruby/rubyscript.cpp
index 2469706a6..381785ff5 100644
--- a/lib/kross/ruby/rubyscript.cpp
+++ b/lib/kross/ruby/rubyscript.cpp
@@ -105,6 +105,7 @@ void RubyScript::compile()
 #endif // HAVE_RUBY_1_9
     VALUE src = RubyExtension::toVALUE( m_scriptcontainer->getCode() );
     StringValue(src);
+    VALUE name = RubyExtension::toVALUE( m_scriptcontainer->getName() );
 
 #ifdef HAVE_RUBY_1_9
     // FIXME
@@ -113,7 +114,7 @@ void RubyScript::compile()
     rb_thread_critical = Qtrue;
     ruby_in_eval++;
 #endif // HAVE_RUBY_1_9
-    rb_funcall(d->m_script, rb_intern("module_eval"), 2, src, (char*) m_scriptcontainer->getName().latin1());
+    rb_funcall(d->m_script, rb_intern("module_eval"), 2, src, name);
 #ifdef HAVE_RUBY_1_9
     // FIXME
 #else // HAVE_RUBY_1_9