diff --git a/History.txt b/History.txt
index 233e1108..0270cfff 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,11 @@
+=== 2.10.2 / 2014-11-26
+
+* 1 bug fix:
+  * Conditionalize thread local cleaning, fixes perf degradation fix
+    The code to clean out all Thread locals adds pretty significant
+    overhead to a each request, so it has to be turned on explicitly
+    if a user needs it.
+
 === 2.10.1 / 2014-11-24
 
 * 1 bug fix:
diff --git a/lib/puma/const.rb b/lib/puma/const.rb
index 4175f2d8..c07502ec 100644
--- a/lib/puma/const.rb
+++ b/lib/puma/const.rb
@@ -28,7 +28,7 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.10.1".freeze
+    PUMA_VERSION = VERSION = "2.10.2".freeze
     CODE_NAME = "Robots on Comets".freeze
 
     FAST_TRACK_KA_TIMEOUT = 0.2