diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 5110a819c..406ff5292 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-10  Christopher Faylor  <cgf@redhat.com>
+
+	* net.cc: Use gethostname define from winsock2.h.
+
 2003-01-10  Christopher Faylor  <cgf@redhat.com>
 
 	* path.cc: Unrevert below reversion except for
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index b55e439b4..4bf5b242d 100644
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -19,7 +19,9 @@ details. */
 #include <iphlpapi.h>
 
 #include <stdlib.h>
+#define gethostname cygwin_gethostname
 #include <unistd.h>
+#undef gethostname
 #include <netdb.h>
 #define USE_SYS_TYPES_FD_SET
 #include <winsock2.h>