diff --git a/History.txt b/History.txt
index de8a2101..4d2ef4da 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,26 @@
+=== 2.4.0 / 2013-07-22
+
+* 5 minor features:
+  * Add PUMA_JRUBY_DAEMON_OPTS to get around agent starting twice
+  * Add ability to drain accept socket on shutdown
+  * Add port to DSL
+  * Adds support for using puma config file in capistrano deploys.
+  * Make phased_restart fallback to restart if not available
+
+* 10 bug fixes:
+
+  * Be sure to only delete the pid in the master. Fixes #334
+  * Call out -C/--config flags
+  * Change parser symbol names to avoid clash. Fixes #179
+  * Convert thread pool sizes to integers
+  * Detect when the jruby daemon child doesn't start properly
+  * Fix typo in CLI help
+  * Improve the logging output when hijack is used. Fixes #332
+  * Remove unnecessary thread pool size conversions
+  * Setup :worker_boot as an Array. Fixes #317
+  * Use 127.0.0.1 as REMOTE_ADDR of unix client. Fixes #309
+
+
 === 2.3.2 / 2013-07-08
 
 * 1 bug fix:
diff --git a/lib/puma/const.rb b/lib/puma/const.rb
index 358cf996..a862359f 100644
--- a/lib/puma/const.rb
+++ b/lib/puma/const.rb
@@ -28,8 +28,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.3.2".freeze
-    CODE_NAME = "Delicious Thin Mints"
+    PUMA_VERSION = VERSION = "2.4.0".freeze
+    CODE_NAME = "Crunchy Munchy Lunchy"
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 
diff --git a/puma.gemspec b/puma.gemspec
index e1aed1af..2de3347d 100644
--- a/puma.gemspec
+++ b/puma.gemspec
@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "2.3.2"
+  s.version = "2.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2013-07-09"
+  s.date = "2013-07-22"
   s.description = "Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications. Puma is intended for use in both development and production environments. In order to get the best throughput, it is highly recommended that you use a  Ruby implementation with real threads like Rubinius or JRuby."
   s.email = ["evan@phx.io"]
   s.executables = ["puma", "pumactl"]