diff --git a/Gemfile.lock b/Gemfile.lock
index 0b7e655..be82e20 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    factory_girl (3.6.0)
+    factory_girl (3.6.1)
       activesupport (>= 3.0.0)
 
 GEM
diff --git a/NEWS b/NEWS
index be59abb..0ca3247 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+3.6.1 (August 2, 2012)
+  Update README to include info about running with JRuby
+  Update dependencies on RSpec and tiny versions of Rails in Appraisal
+  Improve flexibility of using traits with associations and add documentation
+  Stub update_column to raise to mirror ActiveRecord's change from update_attribute
+
 3.6.0 (July 27, 2012)
   Code/spec cleanup
   Allow factories with traits to be used in associations
diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock
index 5f683ce..efccde2 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.6.0)
+    factory_girl (3.6.1)
       activesupport (>= 3.0.0)
 
 GEM
diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock
index 9102020..baf97ea 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.6.0)
+    factory_girl (3.6.1)
       activesupport (>= 3.0.0)
 
 GEM
diff --git a/gemfiles/3.2.gemfile.lock b/gemfiles/3.2.gemfile.lock
index 9e118f0..11fe52a 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.6.0)
+    factory_girl (3.6.1)
       activesupport (>= 3.0.0)
 
 GEM
diff --git a/lib/factory_girl/version.rb b/lib/factory_girl/version.rb
index bbf68d7..23ceb96 100644
--- a/lib/factory_girl/version.rb
+++ b/lib/factory_girl/version.rb
@@ -1,3 +1,3 @@
 module FactoryGirl
-  VERSION = '3.6.0'
+  VERSION = '3.6.1'
 end