diff --git a/Changelog b/Changelog
index 34ba05e..c9490c7 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,9 @@
+2.5.2 (February 10, 2012)
+  Fix step definitions to use associations defined in parent factories
+  Add inline trait support to (build|create)_list
+  Update ActiveSupport dependency to >= 2.3.9, which introduced
+    class_attribute
+
 2.5.1 (February 3, 2012)
   Fix attribute evaluation when the attribute isn't defined in the factory but
     is a private method on Object
diff --git a/Gemfile.lock b/Gemfile.lock
index fe649bb..5404b49 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    factory_girl (2.5.1)
+    factory_girl (2.5.2)
       activesupport (>= 2.3.9)
 
 GEM
diff --git a/gemfiles/2.3.gemfile.lock b/gemfiles/2.3.gemfile.lock
index 405981b..e08a2dc 100644
--- a/gemfiles/2.3.gemfile.lock
+++ b/gemfiles/2.3.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.5.1)
+    factory_girl (2.5.2)
       activesupport (>= 2.3.9)
 
 GEM
diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock
index 6185c1b..6984de0 100644
--- a/gemfiles/3.0.gemfile.lock
+++ b/gemfiles/3.0.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.5.1)
+    factory_girl (2.5.2)
       activesupport (>= 2.3.9)
 
 GEM
diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock
index 9f5c0dc..2b7137f 100644
--- a/gemfiles/3.1.gemfile.lock
+++ b/gemfiles/3.1.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.5.1)
+    factory_girl (2.5.2)
       activesupport (>= 2.3.9)
 
 GEM
diff --git a/gemfiles/3.2.gemfile.lock b/gemfiles/3.2.gemfile.lock
index d398dba..44e65f3 100644
--- a/gemfiles/3.2.gemfile.lock
+++ b/gemfiles/3.2.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.5.1)
+    factory_girl (2.5.2)
       activesupport (>= 2.3.9)
 
 GEM
diff --git a/lib/factory_girl/version.rb b/lib/factory_girl/version.rb
index ecaa361..ffb8250 100644
--- a/lib/factory_girl/version.rb
+++ b/lib/factory_girl/version.rb
@@ -1,4 +1,4 @@
 module FactoryGirl
-  VERSION = "2.5.1"
+  VERSION = "2.5.2"
 end