diff --git a/ChangeLog b/ChangeLog
index e43e9500d0..e5bccd9e13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Oct 30 11:33:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (ruby_pc): ignore missing variables.
+
+	* template/ruby.pc.in: add missing variables for mswin.
+
 Sat Oct 30 10:24:35 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
 	* object.c: Make BasicObject.new accept no parameter.
diff --git a/template/ruby.pc.in b/template/ruby.pc.in
index 61a29b1966..58beda4fbf 100644
--- a/template/ruby.pc.in
+++ b/template/ruby.pc.in
@@ -11,6 +11,10 @@ RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
 RUBY_BASE_NAME=@RUBY_BASE_NAME@
 RUBY_SO_NAME=@RUBY_SO_NAME@
 RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
+LIBPATH=@LIBPATH@
+LIBRUBY=@LIBRUBY@
+LIBRUBY_A=@LIBRUBY_A@
+LIBRUBY_SO=@LIBRUBY_SO@
 LIBRUBYARG_SHARED=@LIBRUBYARG_SHARED@
 LIBRUBYARG_STATIC=@LIBRUBYARG_STATIC@
 LIBRUBYARG=@LIBRUBYARG@
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 6d654d90e7..d32e0c7b1a 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -899,9 +899,10 @@ end
 <<KEEP
 
 $(ruby_pc): $(RBCONFIG)
-	@$(MINIRUBY) -rrbconfig -p \
+	@$(MINIRUBY) -r./rbconfig -p \
+	-e 'STDOUT.binmode' \
 	-e '$$_.gsub!(/@([a-z_]\w*)@/i) {' \
-	-e 'RbConfig::MAKEFILE_CONFIG[$$1].gsub(/\$$\((.+?)\)/, %Q[$${\1}])'
+	-e '(RbConfig::MAKEFILE_CONFIG[$$1] or "").gsub(/\$$\((.+?)\)/, %Q[$${\\1}])' \
 	-e '}' \
 	$(srcdir)/template/ruby.pc.in > $@