diff --git a/Makefile.nmake b/Makefile.nmake
index 5f1226d5bc..ca63f8a7e7 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.424 2004/06/21 17:27:35 ulfl Exp $
+# $Id: Makefile.nmake,v 1.425 2004/06/26 02:16:15 guy Exp $
 
 include config.nmake
 include <win32.mak>
@@ -196,7 +196,7 @@ randpkt.exe	: $(randpkt_OBJECTS) $(EXTRA_OBJECTS)
 <<
 
 dissectors.lib: config.h $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS)
-	lib /out:dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS)
+	link /lib /out:dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS)
 
 config.h	: config.h.win32 config.nmake
 	sed -e s/@VERSION@/$(VERSION)/ \
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 795f4f4562..4ee28569cd 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.44 2004/06/25 07:10:54 jmayer Exp $
+# $Id: Makefile.nmake,v 1.45 2004/06/26 02:16:15 guy Exp $
 
 include ..\config.nmake
 include <win32.mak>
@@ -76,7 +76,7 @@ libethereal.dll: ..\config.h $(OBJECTS) libethereal.def ftypes dfilter doxygen
 		
 
 ethereal.lib	: ..\config.h $(OBJECTS)
-	lib /out:ethereal.lib $(OBJECTS)
+	link /lib /out:ethereal.lib $(OBJECTS)
 
 ..\config.h	: ..\config.h.win32 ..\config.nmake
 	cd ..
diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake
index 7581de5f8b..5e0f6bcdef 100644
--- a/epan/dfilter/Makefile.nmake
+++ b/epan/dfilter/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.13 2004/05/06 20:48:36 obiot Exp $
+# $Id: Makefile.nmake,v 1.14 2004/06/26 02:16:16 guy Exp $
 
 include ..\..\config.nmake
 
@@ -35,7 +35,7 @@ OBJECTS = \
 	syntax-tree.obj
 
 dfilter.lib	: $(OBJECTS)
-	lib /out:dfilter.lib $(OBJECTS)
+	link /lib /out:dfilter.lib $(OBJECTS)
 
 $(OBJECTS): ..\..\config.h
 
diff --git a/epan/ftypes/Makefile.nmake b/epan/ftypes/Makefile.nmake
index e79a734021..5f45c4586f 100644
--- a/epan/ftypes/Makefile.nmake
+++ b/epan/ftypes/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.9 2004/01/22 19:27:59 ulfl Exp $
+# $Id: Makefile.nmake,v 1.10 2004/06/26 02:16:16 guy Exp $
 
 include ..\..\config.nmake
 
@@ -30,7 +30,7 @@ OBJECTS = \
 
 
 ftypes.lib	: $(OBJECTS)
-	lib /out:ftypes.lib $(OBJECTS)
+	link /lib /out:ftypes.lib $(OBJECTS)
 
 
 clean:
diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake
index 3a52de789d..70f149e188 100644
--- a/gtk/Makefile.nmake
+++ b/gtk/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.77 2004/06/25 07:10:54 jmayer Exp $
+# $Id: Makefile.nmake,v 1.78 2004/06/26 02:16:16 guy Exp $
 
 include ..\config.nmake
 
@@ -34,7 +34,7 @@ ETHEREAL_WIN32_GTK_OBJECTS = $(ETHEREAL_WIN32_GTK_SRC:.c=.obj)
 	
 
 libui.lib	: ..\config.h $(ETHEREAL_WIN32_GTK_OBJECTS) $(ETHEREAL_TAP_OBJECTS)
-	lib /out:libui.lib $(ETHEREAL_WIN32_GTK_OBJECTS) $(ETHEREAL_TAP_OBJECTS)
+	link /lib /out:libui.lib $(ETHEREAL_WIN32_GTK_OBJECTS) $(ETHEREAL_TAP_OBJECTS)
 
 ethereal-tap-register.c: $(ETHEREAL_TAP_SRC) ../make-tapreg-dotc Makefile.common
 	@echo Making ethereal-tap-register.c