diff --git a/lib/remote_storage/riak.rb b/lib/remote_storage/riak.rb
index 1add990..ac9d3a6 100644
--- a/lib/remote_storage/riak.rb
+++ b/lib/remote_storage/riak.rb
@@ -168,7 +168,7 @@ module RemoteStorage
     def set_object_response_headers(object)
       server.headers["Content-Type"]   = object.content_type
       server.headers["ETag"]           = object.etag
-      server.headers["Content-Length"] = object_size(object)
+      server.headers["Content-Length"] = object_size(object).to_s
     end
 
     def set_directory_response_headers(directory_object)
diff --git a/spec/riak_spec.rb b/spec/riak_spec.rb
index d5e2183..f252148 100644
--- a/spec/riak_spec.rb
+++ b/spec/riak_spec.rb
@@ -29,7 +29,7 @@ describe "App with Riak backend" do
 
     it "has a Content-Length header set" do
       last_response.status.must_equal 200
-      last_response.headers["Content-Length"].must_equal 14
+      last_response.headers["Content-Length"].must_equal '14'
     end
   end
 
@@ -129,7 +129,7 @@ describe "App with Riak backend" do
 
       it "has a Content-Length header set" do
         last_response.status.must_equal 200
-        last_response.headers["Content-Length"].must_equal 22
+        last_response.headers["Content-Length"].must_equal '22'
       end
     end