diff --git a/ChangeLog b/ChangeLog
index 26470c89ad..80790b33de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Nov 10 12:19:43 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/webrick/server.rb (shutdown): Use close() on @shutdown_pipe_w to
+	  notify readability on the read side of the pipe.
+	  write_nonblock() is not usable for pipe on Windows.
+	  (cleanup_shutdown_pipe): Rescue IOError for @shutdown_pipe_w.close.
+
 Mon Nov 10 07:31:59 2014  Tanaka Akira  <akr@fsij.org>
 
 	* lib/webrick/server.rb (initialize): Initialize shutdown pipe here
diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
index dd1be6ab23..9b83c8451d 100644
--- a/lib/webrick/server.rb
+++ b/lib/webrick/server.rb
@@ -226,10 +226,9 @@ module WEBrick
       stop
 
       shutdown_pipe_w = @shutdown_pipe_w # another thread may modify @shutdown_pipe_w.
-      if shutdown_pipe_w
+      if shutdown_pipe_w && !shutdown_pipe_w.closed?
         begin
-          shutdown_pipe_w.write_nonblock "a"
-        rescue IO::WaitWritable
+          shutdown_pipe_w.close
         rescue IOError # closed by another thread.
         end
       end
@@ -320,7 +319,10 @@ module WEBrick
 
     def cleanup_shutdown_pipe
       @shutdown_pipe_r.close
-      @shutdown_pipe_w.close
+      begin
+        @shutdown_pipe_w.close
+      rescue IOError # another thread closed @shutdown_pipe_w.
+      end
       @shutdown_pipe_r = @shutdown_pipe_w = nil
     end