diff --git a/ChangeLog b/ChangeLog
index 1d021801b7..631b9fed9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul  2 09:51:44 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/rubygems/resolver.rb: fix error of null device reference with DOSISH
+	  platform.
+
 Thu Jul  2 06:49:44 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
 	* lib/rubygems: Update to RubyGems HEAD(c202db2).
diff --git a/lib/rubygems/resolver.rb b/lib/rubygems/resolver.rb
index dcd1ade0d6..fdb5ca9cf2 100644
--- a/lib/rubygems/resolver.rb
+++ b/lib/rubygems/resolver.rb
@@ -172,7 +172,7 @@ class Gem::Resolver
   include Molinillo::UI
 
   def output
-    @output ||= debug? ? $stdout : File.open('/dev/null', 'w')
+    @output ||= debug? ? $stdout : File.open(Gem::Util::NULL_DEVICE, 'w')
   end
 
   def debug?