diff --git a/Gemfile.lock b/Gemfile.lock
index c13efa9..e61df14 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    factory_girl (3.5.0)
+    factory_girl (3.6.0)
       activesupport (>= 3.0.0)
 
 GEM
diff --git a/NEWS b/NEWS
index 06d71fe..be59abb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+3.6.0 (July 27, 2012)
+  Code/spec cleanup
+  Allow factories with traits to be used in associations
+  Refactor Factory to use DefinitionHierarchy to handle managing callbacks,
+    custom constructor, and custom to_create
+  Add memoization to speed up factories providing attribute overrides
+  Add initial support of JRuby when running in 1.9 mode
+  Improve docs on what happens when including FactoryGirl::Syntax::Methods
+
 3.5.0 (June 22, 2012)
   Allow created_at to be set when using build_stubbed
   Deprecate FactoryGirl step definitions
diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock
index bc65913..849a557 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 (3.5.0)
+    factory_girl (3.6.0)
       activesupport (>= 3.0.0)
 
 GEM
diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock
index c079fed..441b709 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 (3.5.0)
+    factory_girl (3.6.0)
       activesupport (>= 3.0.0)
 
 GEM
diff --git a/gemfiles/3.2.gemfile.lock b/gemfiles/3.2.gemfile.lock
index b8c13c0..df845b5 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 (3.5.0)
+    factory_girl (3.6.0)
       activesupport (>= 3.0.0)
 
 GEM
diff --git a/lib/factory_girl/version.rb b/lib/factory_girl/version.rb
index 790de62..bbf68d7 100644
--- a/lib/factory_girl/version.rb
+++ b/lib/factory_girl/version.rb
@@ -1,3 +1,3 @@
 module FactoryGirl
-  VERSION = '3.5.0'
+  VERSION = '3.6.0'
 end