diff --git a/cryptest.nmake b/cryptest.nmake
index d8ab9d1e..a55c218a 100644
--- a/cryptest.nmake
+++ b/cryptest.nmake
@@ -227,10 +227,11 @@ cryptlib.lib: $(LIB_OBJS)
 #	$(LD) dump2def.obj kernel32.lib /out:$@
 
 cryptopp.map:
-	$(LD) $(LDFLAGS) /DLL /MAP /MAPINFO:EXPORTS $(LIB_OBJS) $(LDLIBS) /out:cryptopp.dll
+	$(LD) $(LDFLAGS) /DLL /MAP /MAPINFO:EXPORTS $(LIB_OBJS)
+	mv cryptlib.map cryptopp.map
 
 cryptopp.dump: cryptlib.lib
-	dumpbin /LINKERMEMBER cryptlib.lib > cryptopp.dump
+	dumpbin.exe /LINKERMEMBER cryptlib.lib /OUT:$@
 
 cryptopp.def: cryptlib.lib cryptopp.dump
 	dump2def.exe cryptopp.dump cryptopp.def