diff --git a/lib/remote_storage/riak.rb b/lib/remote_storage/riak.rb
index 4544cb6..3e53ad0 100644
--- a/lib/remote_storage/riak.rb
+++ b/lib/remote_storage/riak.rb
@@ -36,8 +36,10 @@ module RemoteStorage
 
     def get_data(user, directory, key)
       object = data_bucket.get("#{user}:#{directory}:#{key}")
+
       headers["Content-Type"] = object.content_type
-      headers["Last-Modified"] = object.last_modified.to_s(:rfc822)
+      headers["Last-Modified"] = last_modified_date_for(object)
+
       case object.content_type[/^[^;\s]+/]
       when "application/json"
         return object.data.to_json
@@ -51,6 +53,7 @@ module RemoteStorage
     def get_directory_listing(user, directory)
       directory_object = directory_bucket.get("#{user}:#{directory}")
       timestamp = directory_object.data.to_i
+      timestamp /= 1000 if timestamp.to_s.length == 13
       headers["Content-Type"] = "application/json"
       headers["Last-Modified"] = Time.at(timestamp).to_s(:rfc822)
 
@@ -73,10 +76,10 @@ module RemoteStorage
       directory_index = directory == "" ? "/" : directory
       object.indexes.merge!({:user_id_bin => [user],
                              :directory_bin => [CGI.escape(directory_index)]})
+      timestamp = (Time.now.to_f * 1000).to_i
+      object.meta["timestamp"] = timestamp
       object.store
 
-      object.reload
-      timestamp = object.last_modified.to_i
       update_all_directory_objects(user, directory, timestamp)
 
       halt 200
@@ -101,6 +104,14 @@ module RemoteStorage
       ::Riak::Serializers[content_type[/^[^;\s]+/]]
     end
 
+    def last_modified_date_for(object)
+      timestamp = object.meta["timestamp"]
+      timestamp = (timestamp[0].to_i / 1000) if timestamp
+      last_modified = timestamp ? Time.at(timestamp) : object.last_modified
+
+      last_modified.to_s(:rfc822)
+    end
+
     def directory_permission(authorizations, directory)
       authorizations = authorizations.map do |auth|
         auth.index(":") ? auth.split(":") : [auth, "rw"]
@@ -125,12 +136,20 @@ module RemoteStorage
 
       sub_directories(user, directory).each do |entry|
         directory_name = CGI.unescape(entry["name"]).split("/").last
-        listing.merge!({ "#{directory_name}/" => entry["timestamp"].to_i })
+        timestamp = entry["timestamp"].to_i
+        timestamp /= 1000 if timestamp.to_s.length == 13
+
+        listing.merge!({ "#{directory_name}/" => timestamp })
       end
 
       directory_entries(user, directory).each do |entry|
-        timestamp = DateTime.rfc2822(entry["last_modified"]).to_i
         entry_name = CGI.unescape(entry["name"])
+        timestamp = if entry["timestamp"]
+                      entry["timestamp"].to_i
+                    else
+                      DateTime.rfc2822(entry["last_modified"]).to_i
+                    end
+
         listing.merge!({ CGI.escape(entry_name) => timestamp })
       end
 
@@ -152,9 +171,11 @@ module RemoteStorage
           keys.splice(0, 2);
           key_name = keys.join(':');
           last_modified_date = v.values[0]['metadata']['X-Riak-Last-Modified'];
+          timestamp = v.values[0]['metadata']['X-Riak-Meta']['X-Riak-Meta-Timestamp'];
           return [{
             name: key_name,
             last_modified: last_modified_date,
+            timestamp: timestamp,
           }];
         }
       EOH
diff --git a/spec/directories_spec.rb b/spec/directories_spec.rb
index cd12c52..2e918a9 100644
--- a/spec/directories_spec.rb
+++ b/spec/directories_spec.rb
@@ -39,6 +39,11 @@ describe "Directories" do
 
       last_response.status.must_equal 200
       last_response.headers["Last-Modified"].wont_be_nil
+
+      now = Time.now
+      last_modified = DateTime.parse(last_response.headers["Last-Modified"])
+      last_modified.year.must_equal now.year
+      last_modified.day.must_equal now.day
     end
 
     it "has CORS headers set" do
@@ -116,7 +121,7 @@ describe "Directories" do
           object = data_bucket.get("jimmy:tasks/private/projects/world-domination:start")
           directory = directory_bucket.get("jimmy:tasks")
 
-          directory.data.to_i.must_equal object.last_modified.to_i
+          directory.data.to_i.must_equal object.meta['timestamp'][0].to_i
         end
       end
     end
@@ -182,7 +187,7 @@ describe "Directories" do
           directory = directory_bucket.get("jimmy:tasks/home")
 
           directory.data.wont_be_nil
-          directory.data.to_i.must_equal object.last_modified.to_i
+          directory.data.to_i.must_equal object.meta['timestamp'][0].to_i
         end
 
         it "sets the correct index for the directory object" do
@@ -221,7 +226,7 @@ describe "Directories" do
           object = data_bucket.get("jimmy:tasks/home:trash")
           directory = directory_bucket.get("jimmy:tasks/home")
 
-          directory.data.to_i.must_equal object.last_modified.to_i
+          directory.data.to_i.must_equal object.meta['timestamp'][0].to_i
         end
       end
     end
diff --git a/spec/riak_spec.rb b/spec/riak_spec.rb
index 7088b00..e27958d 100644
--- a/spec/riak_spec.rb
+++ b/spec/riak_spec.rb
@@ -14,14 +14,24 @@ describe "App with Riak backend" do
       object.content_type = "text/plain"
       object.data = "some text data"
       object.store
+
+      get "/jimmy/public/foo"
     end
 
     it "returns the value on all get requests" do
-      get "/jimmy/public/foo"
-
       last_response.status.must_equal 200
       last_response.body.must_equal "some text data"
     end
+
+    it "has a Last-Modified header set" do
+      last_response.status.must_equal 200
+      last_response.headers["Last-Modified"].wont_be_nil
+
+      now = Time.now
+      last_modified = DateTime.parse(last_response.headers["Last-Modified"])
+      last_modified.year.must_equal now.year
+      last_modified.day.must_equal now.day
+    end
   end
 
   describe "GET data with custom content type" do