diff --git a/lib/ramaze.rb b/lib/ramaze.rb
index 17eef49b..b963f6ed 100644
--- a/lib/ramaze.rb
+++ b/lib/ramaze.rb
@@ -66,7 +66,14 @@ class << self; attr_accessor :options; end
     m.use Rack::ShowStatus
     m.use Rack::RouteExceptions
     m.use Rack::ConditionalGet
-    m.use Rack::ETag, 'public'
+
+    # FIXME: This works around differences between Rack 1.2.1 and the git HEAD
+    if Rack::ETag.instance_method(:initialize).arity == 1
+      m.use Rack::ETag
+    else
+      m.use Rack::ETag, 'public'
+    end
+
     m.use Rack::Head
     m.use Ramaze::Reloader
     m.run Ramaze::AppMap
@@ -77,6 +84,14 @@ class << self; attr_accessor :options; end
     m.use Rack::RouteExceptions
     m.use Rack::ShowStatus
     m.use Rack::ConditionalGet
+
+    # FIXME: This works around differences between Rack 1.2.1 and the git HEAD
+    if Rack::ETag.instance_method(:initialize).arity == 1
+      m.use Rack::ETag
+    else
+      m.use Rack::ETag, 'public'
+    end
+
     m.use Rack::ETag
     m.use Rack::Head
     m.run Ramaze::AppMap