diff --git a/src/node.h b/src/node.h
index 9984faef5b2f..ded8b7853671 100644
--- a/src/node.h
+++ b/src/node.h
@@ -149,7 +149,7 @@ NODE_EXTERN ssize_t DecodeWrite(char *buf,
                                 v8::Handle<v8::Value>,
                                 enum encoding encoding = BINARY);
 
-v8::Local<v8::Object> BuildStatsObject(const uv_statbuf_t* s);
+v8::Local<v8::Object> BuildStatsObject(const uv_stat_t* s);
 
 
 static inline v8::Persistent<v8::Function>* cb_persist(
diff --git a/src/node_file.cc b/src/node_file.cc
index 684044401d6d..69b76736c344 100644
--- a/src/node_file.cc
+++ b/src/node_file.cc
@@ -151,7 +151,7 @@ static void After(uv_fs_t *req) {
       case UV_FS_STAT:
       case UV_FS_LSTAT:
       case UV_FS_FSTAT:
-        argv[1] = BuildStatsObject(static_cast<const uv_statbuf_t*>(req->ptr));
+        argv[1] = BuildStatsObject(static_cast<const uv_stat_t*>(req->ptr));
         break;
 
       case UV_FS_READLINK:
@@ -274,7 +274,7 @@ static Persistent<String> atime_symbol;
 static Persistent<String> mtime_symbol;
 static Persistent<String> ctime_symbol;
 
-Local<Object> BuildStatsObject(const uv_statbuf_t* s) {
+Local<Object> BuildStatsObject(const uv_stat_t* s) {
   HandleScope scope(node_isolate);
 
   if (dev_symbol.IsEmpty()) {
@@ -339,15 +339,17 @@ Local<Object> BuildStatsObject(const uv_statbuf_t* s) {
 # endif
 #undef X
 
-#define X(name)                                                               \
+#define X(name, rec)                                                          \
   {                                                                           \
-    Local<Value> val = NODE_UNIXTIME_V8(s->st_##name);                        \
+    double msecs = static_cast<double>(s->st_##rec.tv_sec) * 1000;            \
+    msecs += static_cast<double>(s->st_##rec.tv_nsec / 1000000);              \
+    Local<Value> val = v8::Date::New(msecs);                                  \
     if (val.IsEmpty()) return Local<Object>();                                \
     stats->Set(name##_symbol, val);                                           \
   }
-  X(atime)
-  X(mtime)
-  X(ctime)
+  X(atime, atim)
+  X(mtime, mtim)
+  X(ctime, ctim)
 #undef X
 
   return scope.Close(stats);
@@ -366,7 +368,7 @@ static Handle<Value> Stat(const Arguments& args) {
   } else {
     SYNC_CALL(stat, *path, *path)
     return scope.Close(
-        BuildStatsObject(static_cast<const uv_statbuf_t*>(SYNC_REQ.ptr)));
+        BuildStatsObject(static_cast<const uv_stat_t*>(SYNC_REQ.ptr)));
   }
 }
 
@@ -383,7 +385,7 @@ static Handle<Value> LStat(const Arguments& args) {
   } else {
     SYNC_CALL(lstat, *path, *path)
     return scope.Close(
-        BuildStatsObject(static_cast<const uv_statbuf_t*>(SYNC_REQ.ptr)));
+        BuildStatsObject(static_cast<const uv_stat_t*>(SYNC_REQ.ptr)));
   }
 }
 
@@ -401,7 +403,7 @@ static Handle<Value> FStat(const Arguments& args) {
   } else {
     SYNC_CALL(fstat, 0, fd)
     return scope.Close(
-        BuildStatsObject(static_cast<const uv_statbuf_t*>(SYNC_REQ.ptr)));
+        BuildStatsObject(static_cast<const uv_stat_t*>(SYNC_REQ.ptr)));
   }
 }
 
diff --git a/src/node_stat_watcher.cc b/src/node_stat_watcher.cc
index fb3d0a9ad6bd..582c50c70f11 100644
--- a/src/node_stat_watcher.cc
+++ b/src/node_stat_watcher.cc
@@ -71,8 +71,8 @@ StatWatcher::~StatWatcher() {
 
 void StatWatcher::Callback(uv_fs_poll_t* handle,
                            int status,
-                           const uv_statbuf_t* prev,
-                           const uv_statbuf_t* curr) {
+                           const uv_stat_t* prev,
+                           const uv_stat_t* curr) {
   StatWatcher* wrap = static_cast<StatWatcher*>(handle->data);
   assert(wrap->watcher_ == handle);
   HandleScope scope(node_isolate);
diff --git a/src/node_stat_watcher.h b/src/node_stat_watcher.h
index 18afa79944f5..94ed10a0eea2 100644
--- a/src/node_stat_watcher.h
+++ b/src/node_stat_watcher.h
@@ -44,8 +44,8 @@ class StatWatcher : ObjectWrap {
  private:
   static void Callback(uv_fs_poll_t* handle,
                        int status,
-                       const uv_statbuf_t* prev,
-                       const uv_statbuf_t* curr);
+                       const uv_stat_t* prev,
+                       const uv_stat_t* curr);
   void Stop();
 
   uv_fs_poll_t* watcher_;