diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index cfd29d191..2af71f7e5 100644
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -718,7 +718,7 @@ cygwin_gethostname (char *name, size_t len)
 	{
 	  DWORD local_len = len;
 
-	  if (!GetComputerNameExA (ComputerNameDnsFullyQualified, name,
+	  if (!GetComputerNameExA (ComputerNameDnsHostname, name,
 				   &local_len))
 	    {
 	      if (GetLastError () == ERROR_MORE_DATA)
diff --git a/winsup/cygwin/release/2.12.0 b/winsup/cygwin/release/2.12.0
index c847b91c0..5835952ee 100644
--- a/winsup/cygwin/release/2.12.0
+++ b/winsup/cygwin/release/2.12.0
@@ -79,3 +79,5 @@ Bug Fixes
   Addresses: https://cygwin.com/ml/cygwin/2018-12/msg00173.html
 
 - Fix thread names in GDB when cygthreads get reused.
+
+- Fix return value of gethostname in a border case.