diff --git a/lib/guard/webrick/runner.rb b/lib/guard/webrick/runner.rb
index <HASH>..<HASH> 100644
--- a/lib/guard/webrick/runner.rb
+++ b/lib/guard/webrick/runner.rb
@@ -21,6 +21,8 @@ module Guard
 
       def stop
         Process.kill("HUP", pid)
+        @pid = nil
+        true
       end
     end
   end
diff --git a/spec/guard/webrick/runner_spec.rb b/spec/guard/webrick/runner_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/guard/webrick/runner_spec.rb
+++ b/spec/guard/webrick/runner_spec.rb
@@ -38,20 +38,32 @@ describe Guard::WEBrick::Runner do
     it "should kill the process running the HTTPServer" do
       Process.stub(:fork).and_return(12345)
       Process.should_receive(:kill).with("HUP", 12345)
-      new_runner.stop
+      subject = new_runner
+      subject.stop
+    end
+
+    it "should set the pid back to nil" do
+      Process.stub(:fork).and_return(12345)
+      Process.should_receive(:kill).with("HUP", 12345)
+      subject = new_runner
+      subject.stop
+      subject.pid.should be_nil
     end
 
     it "should shutdown the WEBrick::HTTPServer instance" do
       make_fake_forked_server
       Signal.trap("USR1") { @css = true }
 
-      r = new_runner
+      subject = new_runner
       sleep 0.05    # wait for HTTPServer to fork and start
-      r.stop
+      subject.stop
       sleep 0.05    # wait to get USR1 signal from child pid
       @css.should be_true
     end
   end
+
+  describe "restart" do
+  end
 end
 
 def new_runner(options = {})
Set @pid to nil when server is shutdown.