diff --git a/Gemfile.lock b/Gemfile.lock
index 5904a95..3fdc8e8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capybara-webkit (1.1.1)
+    capybara-webkit (1.2.0)
       capybara (>= 2.0.2, < 2.4.0)
       json
 
@@ -25,8 +25,12 @@ GEM
     ffi (1.9.3-java)
     ffi (1.9.3-x86-mingw32)
     json (1.8.1)
+    json (1.8.1-java)
     launchy (2.4.2)
       addressable (~> 2.3)
+    launchy (2.4.2-java)
+      addressable (~> 2.3)
+      spoon (~> 0.0.1)
     mime-types (2.3)
     mini_magick (3.2.1)
       subexec (~> 0.0.4)
@@ -34,6 +38,9 @@ GEM
     multi_json (1.8.4)
     nokogiri (1.6.2.1)
       mini_portile (= 0.6.0)
+    nokogiri (1.6.2.1-java)
+    nokogiri (1.6.2.1-x86-mingw32)
+      mini_portile (= 0.6.0)
     rack (1.5.2)
     rack-protection (1.3.2)
       rack
@@ -58,6 +65,8 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
+    spoon (0.0.4)
+      ffi
     subexec (0.0.4)
     tilt (1.3.3)
     websocket (1.0.7)
diff --git a/NEWS.md b/NEWS.md
index 30fe167..920a451 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,7 @@
+New for 1.2.0:
+* Capybara 2.3 compatibility.
+* Kill webkit_server when parent process closes stdin.
+
 New for 1.1.1:
 * Lock capybara dependency to < 2.2.0.
 
diff --git a/gemfiles/2.1.gemfile.lock b/gemfiles/2.1.gemfile.lock
index 1edafa2..dfab202 100644
--- a/gemfiles/2.1.gemfile.lock
+++ b/gemfiles/2.1.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    capybara-webkit (1.1.1)
+    capybara-webkit (1.2.0)
       capybara (>= 2.0.2, < 2.4.0)
       json
 
diff --git a/gemfiles/2.2.gemfile.lock b/gemfiles/2.2.gemfile.lock
index 610f4fe..9ec68ef 100644
--- a/gemfiles/2.2.gemfile.lock
+++ b/gemfiles/2.2.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    capybara-webkit (1.1.1)
+    capybara-webkit (1.2.0)
       capybara (>= 2.0.2, < 2.4.0)
       json
 
diff --git a/gemfiles/2.3.gemfile.lock b/gemfiles/2.3.gemfile.lock
index 7a84a26..6aeee36 100644
--- a/gemfiles/2.3.gemfile.lock
+++ b/gemfiles/2.3.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    capybara-webkit (1.1.1)
+    capybara-webkit (1.2.0)
       capybara (>= 2.0.2, < 2.4.0)
       json
 
diff --git a/lib/capybara/webkit/version.rb b/lib/capybara/webkit/version.rb
index 83699f5..c4e4aa9 100644
--- a/lib/capybara/webkit/version.rb
+++ b/lib/capybara/webkit/version.rb
@@ -1,7 +1,7 @@
 module Capybara
   module Driver
     class Webkit
-      VERSION = '1.1.1'.freeze
+      VERSION = '1.2.0'.freeze
     end
   end
 end