diff --git a/History.txt b/History.txt
index 68fe68f0..1244b9b3 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,25 @@
+=== 2.5.0 / 2013-08-08
+
+* 2 minor features:
+  * Allow configuring pumactl with config.rb
+  * make `pumactl restart` start puma if not running
+
+* 6 bug fixes:
+  * Autodetect ruby managers and home directory in upstart script
+  * Convert header values to string before sending.
+  * Correctly report phased-restart availability
+  * Fix pidfile creation/deletion race on jruby daemonization
+  * Use integers when comparing thread counts
+  * Fix typo in using lopez express (raw tcp) mode
+
+* 6 misc changes:
+  * Fix typo in phased-restart response
+  * Uncomment setuid/setgid by default in upstart
+  * Use Puma::Const::PUMA_VERSION in gemspec
+  * Update upstart comments to reflect new commandline
+  * Remove obsolete pumactl instructions; refer to pumactl for details
+  * Make Bundler used puma.gemspec version agnostic
+
 === 2.4.1 / 2013-08-07
 
 * 1 experimental feature:
diff --git a/lib/puma/const.rb b/lib/puma/const.rb
index 62621acc..2df9139f 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.4.1".freeze
-    CODE_NAME = "Crunchy Munchy Lunchy"
+    PUMA_VERSION = VERSION = "2.5.0".freeze
+    CODE_NAME = "Astronaut Shoelaces"
 
     FAST_TRACK_KA_TIMEOUT = 0.2