diff --git a/deps/uv/src/unix/stream.c b/deps/uv/src/unix/stream.c
index 080535e5f..8137d24ee 100644
--- a/deps/uv/src/unix/stream.c
+++ b/deps/uv/src/unix/stream.c
@@ -1119,7 +1119,7 @@ static void uv__stream_io(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
     return;
   }
 
-  if (events & UV__POLLIN) {
+  if (events & (UV__POLLIN | UV__POLLERR | UV__POLLHUP)) {
     assert(uv__stream_fd(stream) >= 0);
 
     uv__read(stream);
diff --git a/deps/uv/uv.gyp b/deps/uv/uv.gyp
index 55f1e2394..0810bcc48 100644
--- a/deps/uv/uv.gyp
+++ b/deps/uv/uv.gyp
@@ -100,9 +100,11 @@
           ],
           'link_settings': {
             'libraries': [
-              '-lws2_32.lib',
+              '-ladvapi32.lib',
+              '-liphlpapi.lib',
               '-lpsapi.lib',
-              '-liphlpapi.lib'
+              '-lshell32.lib',
+              '-lws2_32.lib'
             ],
           },
         }, { # Not Windows i.e. POSIX