diff --git a/src/node.cc b/src/node.cc
index 958c86dc75b..8257604d526 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -1714,13 +1714,10 @@ static Handle<Value> Uptime(const Arguments& args) {
   HandleScope scope;
   double uptime;
 
-  uv_err_t err = uv_uptime(&uptime);
+  uv_update_time(uv_default_loop());
+  uptime = uv_now(uv_default_loop()) - prog_start_time;
 
-  if (err.code != UV_OK) {
-    return Undefined();
-  }
-
-  return scope.Close(Number::New(uptime - prog_start_time));
+  return scope.Close(Integer::New(uptime / 1000));
 }
 
 
@@ -2893,7 +2890,7 @@ static Handle<Value> DebugEnd(const Arguments& args) {
 
 char** Init(int argc, char *argv[]) {
   // Initialize prog_start_time to get relative uptime.
-  uv_uptime(&prog_start_time);
+  prog_start_time = uv_now(uv_default_loop());
 
   // Make inherited handles noninheritable.
   uv_disable_stdio_inheritance();