diff --git a/src/unix/getaddrinfo.c b/src/unix/getaddrinfo.c
index 283d295f..a4b7b3d6 100644
--- a/src/unix/getaddrinfo.c
+++ b/src/unix/getaddrinfo.c
@@ -34,6 +34,8 @@ static void uv__getaddrinfo_work(struct uv__work* w) {
                              req->service,
                              req->hints,
                              &req->res);
+  if (req->retcode == EAI_SYSTEM)
+    req->retcode = -errno;
 }
 
 
@@ -67,7 +69,10 @@ static void uv__getaddrinfo_done(struct uv__work* w, int status) {
   req->service = NULL;
   req->hostname = NULL;
 
-  if (req->retcode == 0) {
+  if (req->retcode < 0) {
+    /* EAI_SYSTEM error */
+    uv__set_sys_error(req->loop, -req->result);
+  } else if (req->retcode == 0) {
     /* OK */
 #if defined(EAI_NODATA) /* FreeBSD deprecated EAI_NODATA */
   } else if (req->retcode == EAI_NONAME || req->retcode == EAI_NODATA) {