diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 68171f6ca..c4be2314f 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-31  Renato Silva  <br.renatosilva@gmail.com>
+
+	* net.cc (cygwin_gethostname): Fix buffer size error handling.
+
 2015-03-31  Corinna Vinschen  <corinna@vinschen.de>
 
 	* uinfo.cc (pwdgrp::fetch_account_from_windows): Don't allow fully
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index f9b317c0d..eaf6eb870 100644
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -1076,7 +1076,10 @@ cygwin_gethostname (char *name, size_t len)
 	  if (!GetComputerNameExA (ComputerNameDnsFullyQualified, name,
 				   &local_len))
 	    {
-	      set_winsock_errno ();
+	      if (GetLastError () == ERROR_MORE_DATA)
+		set_errno (ENAMETOOLONG);
+	      else
+		set_winsock_errno ();
 	      __leave;
 	    }
 	}