8 files changed, 20 insertions, 4 deletions
diff --git a/src/windows/cns/ChangeLog b/src/windows/cns/ChangeLog
index 2cd2ee87aa..fe7d3ae743 100644
--- a/src/windows/cns/ChangeLog
+++ b/src/windows/cns/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-13  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (SYSLIBS): Use ws2_32.lib instead of wsock32.lib.
+
 2002-06-11  Danilo Almeida  <dalmeida@mit.edu>
 
 	* cns.c: Do not use krb_get_notification_message() or
diff --git a/src/windows/cns/Makefile.in b/src/windows/cns/Makefile.in
index 095b46cba2..2a1aa60b2e 100644
--- a/src/windows/cns/Makefile.in
+++ b/src/windows/cns/Makefile.in
@@ -47,7 +47,7 @@ CVTRES = cvtres
 ##### Linker
 LINK 	 = link
 LIBS 	 = $(KLIB) $(CLIB) $(WLIB) ../lib/$(OUTPRE)libwin.lib
-SYSLIBS = kernel32.lib wsock32.lib user32.lib gdi32.lib advapi32.lib
+SYSLIBS = kernel32.lib ws2_32.lib user32.lib gdi32.lib advapi32.lib
 LFLAGS = /nologo $(LOPTS)
 
 all:: Makefile $(OUTPRE)$(NAME).exe
diff --git a/src/windows/gina/ChangeLog b/src/windows/gina/ChangeLog
index d2e378bbf8..e318692e37 100644
--- a/src/windows/gina/ChangeLog
+++ b/src/windows/gina/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-13  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (WINLIBS): Use ws2_32.lib instead of wsock32.lib.
+
 1999-12-03  Danilo Almeida  <dalmeida@mit.edu>
 
 	* Makefile.in: Windows fix for updated win-pre.in.
diff --git a/src/windows/gina/Makefile.in b/src/windows/gina/Makefile.in
index 6cdda3d8ab..3d630e12da 100644
--- a/src/windows/gina/Makefile.in
+++ b/src/windows/gina/Makefile.in
@@ -7,7 +7,7 @@ OBJS=	$(OUTPRE)ginastub.$(OBJEXT)
 LOCALINCLUDES = -I$(BUILDTOP)\include
 
 WINLIBS = advapi32.lib comctl32.lib \
-	libc.lib kernel32.lib wsock32.lib user32.lib shell32.lib oldnames.lib
+	libc.lib kernel32.lib ws2_32.lib user32.lib shell32.lib oldnames.lib
 
 WINDLLFLAGS = /nodefaultlib /incremental:no /release \
 	/nologo /base:0x1c000000 /dll $(LOPTS)
diff --git a/src/windows/gss/ChangeLog b/src/windows/gss/ChangeLog
index cefca162c2..b426555a37 100644
--- a/src/windows/gss/ChangeLog
+++ b/src/windows/gss/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-13  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (SYSLIBS): Use ws2_32.lib instead of wsock32.lib.
+
 2001-10-03  Ken Raeburn  <raeburn@mit.edu>
 
 	* gss.c, gss.h: Don't declare functions FAR any more.
diff --git a/src/windows/gss/Makefile.in b/src/windows/gss/Makefile.in
index 306f7c79a5..b545599aeb 100644
--- a/src/windows/gss/Makefile.in
+++ b/src/windows/gss/Makefile.in
@@ -17,7 +17,7 @@ RCFLAGS	= $(RFLAGS) -D_WIN32 -DGSS_APP
 ##### Linker
 LINK	= link
 LIBS	= $(GLIB) $(CLIB) $(WLIB)
-SYSLIBS	= kernel32.lib wsock32.lib user32.lib gdi32.lib comdlg32.lib
+SYSLIBS	= kernel32.lib ws2_32.lib user32.lib gdi32.lib comdlg32.lib
 LFLAGS	= /nologo $(LOPTS)
 
 all:: Makefile $(OUTPRE)gss.exe
diff --git a/src/windows/wintel/ChangeLog b/src/windows/wintel/ChangeLog
index cd37a3f9d0..a741cfd547 100644
--- a/src/windows/wintel/ChangeLog
+++ b/src/windows/wintel/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-13  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (SYSLIBS): Use ws2_32.lib instead of wsock32.lib.
+
 2001-10-10  Danilo Almeida  <dalmeida@mit.edu>
 
 	* intern.c (ScreenInsChar): Return BOOL.
diff --git a/src/windows/wintel/Makefile.in b/src/windows/wintel/Makefile.in
index 56cddb188d..f1cdbc2690 100644
--- a/src/windows/wintel/Makefile.in
+++ b/src/windows/wintel/Makefile.in
@@ -27,7 +27,7 @@ RCFLAGS	= $(RFLAGS) -D_WIN32 -DTELNET_APP
 ##### Linker
 LINK	= link
 LIBS	= $(KLIB) $(CLIB) $(WLIB)
-SYSLIBS	= kernel32.lib wsock32.lib user32.lib gdi32.lib comdlg32.lib
+SYSLIBS	= kernel32.lib ws2_32.lib user32.lib gdi32.lib comdlg32.lib
 LFLAGS	= /nologo $(LOPTS)
 
 all:: Makefile $(OUTPRE)telnet.exe