diff --git a/History.md b/History.md
index a98c1393b..7c6f87719 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,20 @@
+# Version 2.3.0
+
+Release date: 2014-06-02
+
+### Added
+* New window management API [Andrey Botalov]
+* Speed improvement for visible text detection in RackTest [Thomas Walpole]
+  Thanks to Phillipe Creux for instigating this
+* RSpec 3 compatability
+* 'save_and_open_screenshot' functionality [Greg Lazarev]
+* Server errors raised on visit and synchronize [Jonas Nicklas]
+
+### Fixed
+
+* CSSHandlers now derives from BasicObject so globally included functions (concat, etc) shouldn't cause issues [Thomas Walpole]
+* touched reset after session is reset [lesliepc16]
+
 # Version 2.2.1
 
 Release date: 2014-01-06
diff --git a/lib/capybara/version.rb b/lib/capybara/version.rb
index 9db1a586d..af1c81320 100644
--- a/lib/capybara/version.rb
+++ b/lib/capybara/version.rb
@@ -1,3 +1,3 @@
 module Capybara
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end