diff --git a/ChangeLog b/ChangeLog
index a965037155..e5d6464511 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar 28 11:07:41 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/extmk.rb: set MFLAGS from MAKEFLAGS when using nmake.
+
 Mon Mar 28 11:07:00 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* common.mk (love): all you need is love.
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 13b5ffd6ef..3aa81547d9 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -583,6 +583,7 @@ if $configure_only and $command_output
     mf.puts "Q = $(Q1:0=@)"
     mf.puts "ECHO1 = $(V:1=@:)"
     mf.puts "ECHO = $(ECHO1:0=@echo)"
+    mf.puts "MFLAGS = -$(MAKEFLAGS)" if $nmake
     mf.puts
 
     mf.print "extensions ="