diff --git a/CHANGELOG b/CHANGELOG
index 068cf859c..5a80f4cd9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@
 * Change: BUILDR-484 Upgrade to Scala 2.8.0 (final) and associated dependencies
           (ScalaCheck 1.7, ScalaTest 1.2, Specs 1.6.5)
 * Change: BUILDR-487 package :sources should default to using .jar extension (instead of .zip)
+* Change: Upgrade to Jruby 1.5.2
 * Fixed:  BUILDR-143 Upload to a file:// path needs ability to specify permissions (Joel Muzzerall)
 * Fixed:  BUILDR-144 Filter does not preserve file permissions
 * Fixed:  BUILDR-163 cobertura-check
diff --git a/lib/buildr/java/bdd.rb b/lib/buildr/java/bdd.rb
index 6e790d836..6309446f1 100644
--- a/lib/buildr/java/bdd.rb
+++ b/lib/buildr/java/bdd.rb
@@ -48,7 +48,7 @@ def initialize(task, options)
   module TestFramework::JRubyBased
     extend self
 
-    VERSION = '1.5.1'
+    VERSION = '1.5.2'
 
     class << self
       def version
diff --git a/rakelib/all-in-one.rake b/rakelib/all-in-one.rake
index b4787ca22..5bc804000 100644
--- a/rakelib/all-in-one.rake
+++ b/rakelib/all-in-one.rake
@@ -18,7 +18,7 @@ task "all-in-one" => 'all-in-one:all-in-one'
 
 namespace :'all-in-one' do
   
-  version = "1.5.1"
+  version = "1.5.2"
   jruby_distro = "jruby-bin-#{version}.tar.gz"
   url = "http://jruby.org.s3.amazonaws.com/downloads/#{version}/#{jruby_distro}"
   dir = "jruby-#{version}"