Index: config/init/hints/mswin32.pm
===================================================================
--- config/init/hints/mswin32.pm	(revision 16127)
+++ config/init/hints/mswin32.pm	(working copy)
@@ -58,6 +58,7 @@
 
             make_c     => q{$(PERL) -e "chdir shift @ARGV;}
                 . q{system '$(MAKE)', '-nologo', @ARGV; exit $$? >> 8;"},
+	    make       => 'nmake',	    
 
             # ZI messes with __LINE__
             cc_debug             => '-Zi',
Index: config/inter/make.pm
===================================================================
--- config/inter/make.pm	(revision 16127)
+++ config/inter/make.pm	(working copy)
@@ -40,6 +40,7 @@
 
     # precedence of sources for the program:
     # default -> probe -> environment -> option -> ask
+    $prog ||= $conf->data->get($util);
     $prog ||= $conf->options->get($util);
     $prog ||= $ENV{uc($util)};