diff --git a/deps/uv/README.md b/deps/uv/README.md
index 9bf05992b2..9fc4ae62eb 100644
--- a/deps/uv/README.md
+++ b/deps/uv/README.md
@@ -8,34 +8,37 @@ http://nodejs.org/
 
 ## Features
 
-Implemented Features:
+Implemented:
 
- * Non-blocking sockets and pipes
+ * Non-blocking TCP sockets
 
- * Timers
+ * Non-blocking named pipes
 
  * UDP
 
+ * Timers
+
  * Child process spawning
 
- * Asynchronous DNS via c-ares or getaddrinfo.
+ * Asynchronous DNS via c-ares or `uv_getaddrinfo`.
 
- * Asynchronous file system APIs (uv_fs_*)
+ * Asynchronous file system APIs `uv_fs_*`
 
- * High resolution time (uv_hrtime)
+ * High resolution time `uv_hrtime`
 
- * Current executable path look up (uv_exepath)
+ * Current executable path look up `uv_exepath`
 
- * Thread pool scheduling (uv_queue_work)
+ * Thread pool scheduling `uv_queue_work`
 
-Work in progress:
+In-progress:
 
- * File system events (Currently supports inotify, ReadDirectoryChangesW and
-   will support kqueue and event ports in the near future.)
+ * File system events (Currently supports inotify, `ReadDirectoryChangesW`
+   and will support kqueue and event ports in the near future.)
+   `uv_fs_event_t`
 
- * TTY support (with VT100 emulation on Windows - work in progress) 
+ * VT100 TTY `uv_tty_t`
 
- * Socket sharing between processes
+ * Socket sharing between processes `uv_ipc_t`
 
 
 ## Documentation
@@ -58,7 +61,7 @@ To build with Visual Studio run the vcbuilds.bat file which will
 checkout the GYP code into build/gyp and generate the uv.sln and
 related files.
 
-Windows users can also build from cmd-line using msbuild.  This is 
+Windows users can also build from cmd-line using msbuild.  This is
 done by running vcbuild.bat from Visual Studio command prompt.
 
 To have GYP generate build script for another system you will need to
diff --git a/deps/uv/src/unix/fs.c b/deps/uv/src/unix/fs.c
index d745622835..ec24e8b3fa 100644
--- a/deps/uv/src/unix/fs.c
+++ b/deps/uv/src/unix/fs.c
@@ -447,8 +447,11 @@ int uv_fs_fsync(uv_loop_t* loop, uv_fs_t* req, uv_file file, uv_fs_cb cb) {
 
 int uv_fs_fdatasync(uv_loop_t* loop, uv_fs_t* req, uv_file file, uv_fs_cb cb) {
   char* path = NULL;
-#ifdef __FreeBSD__
-  /* freebsd doesn't have fdatasync, do a full fsync instead. */
+#if defined(__FreeBSD__) \
+  || (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1060)
+  /* freebsd and pre-10.6 darwin don't have fdatasync,
+   * do a full fsync instead.
+   */
   WRAP_EIO(UV_FS_FDATASYNC, eio_fdatasync, fsync, ARGS1(file))
 #else
   WRAP_EIO(UV_FS_FDATASYNC, eio_fdatasync, fdatasync, ARGS1(file))