diff --git a/Merlin/Main/Hosts/IronRuby.Rack/IIS.cs b/Merlin/Main/Hosts/IronRuby.Rack/IIS.cs
index deabd84..8c801af 100644
--- a/Merlin/Main/Hosts/IronRuby.Rack/IIS.cs
+++ b/Merlin/Main/Hosts/IronRuby.Rack/IIS.cs
@@ -4,8 +4,10 @@ using System.Linq;
 using System.Text;
 using System.Web;
 using IronRuby.Builtins;
+using IronRuby.Runtime;
 using IronRuby.StandardLibrary.StringIO;
 using System.Diagnostics;
+using Microsoft.Scripting.Hosting.Providers;

 namespace IronRuby.Rack.Handler {
     public class IIS {
@@ -177,7 +179,7 @@ namespace IronRuby.Rack.Handler {
             //   order to make the error appear for sure.
             // close must never be called on the error stream.

-            SetEnv(env, "rack.errors", IronRuby.Ruby.GetExecutionContext(RubyEngine.Engine).StandardErrorOutput);
+            SetEnv(env, "rack.errors", RubyEngine.Context.StandardErrorOutput);

             // rack.multithread:       true if the application object may be simultaneously
             //   invoked by another thread in the same process, false otherwise.
diff --git a/Merlin/Main/Hosts/IronRuby.Rack/RubyEngine.cs b/Merlin/Main/Hosts/IronRuby.Rack/RubyEngine.cs
index 5358a1e..4ef4901 100644
--- a/Merlin/Main/Hosts/IronRuby.Rack/RubyEngine.cs
+++ b/Merlin/Main/Hosts/IronRuby.Rack/RubyEngine.cs
@@ -6,6 +6,7 @@ using System.IO;
 using Microsoft.Scripting.Hosting;
 using IronRuby.Builtins;
 using IronRuby.Runtime;
+using Microsoft.Scripting.Hosting.Providers;

 namespace IronRuby.Rack {
     public static class RubyEngine {
@@ -14,7 +15,7 @@ namespace IronRuby.Rack {

         public static RubyContext Context {
             get {
-                return Ruby.GetExecutionContext(Engine);
+                return (RubyContext) HostingHelpers.GetLanguageContext(Engine);
             }
         }