diff --git a/Rakefile b/Rakefile
index 26c825dd2..8fc801534 100644
--- a/Rakefile
+++ b/Rakefile
@@ -30,6 +30,7 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.title    = 'Factory Girl'
   rdoc.options << '--line-numbers' << '--inline-source' << "--main" << "README.rdoc"
   rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('CONTRIBUTION_GUIDELINES.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
@@ -40,7 +41,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name        = %q{factory_girl}
-  s.version     = "1.1.5"
+  s.version     = "1.2.0"
   s.summary     = %q{factory_girl provides a framework and DSL for defining and
                      using model instance factories.}
   s.description = %q{factory_girl provides a framework and DSL for defining and
diff --git a/factory_girl.gemspec b/factory_girl.gemspec
index 8b4c1840e..090e113af 100644
--- a/factory_girl.gemspec
+++ b/factory_girl.gemspec
@@ -2,21 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{factory_girl}
-  s.version = "1.1.5"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Ferris"]
-  s.date = %q{2008-12-11}
+  s.date = %q{2009-02-17}
   s.description = %q{factory_girl provides a framework and DSL for defining and using factories - less error-prone, more explicit, and  all-around easier to work with than fixtures.}
   s.email = %q{jferris@thoughtbot.com}
-  s.extra_rdoc_files = ["README.textile"]
-  s.files = ["Changelog", "CONTRIBUTION_GUIDELINES.rdoc", "LICENSE", "Rakefile", "README.textile", "lib/factory_girl/aliases.rb", "lib/factory_girl/attribute.rb", "lib/factory_girl/attribute_proxy.rb", "lib/factory_girl/factory.rb", "lib/factory_girl/sequence.rb", "lib/factory_girl.rb", "test/aliases_test.rb", "test/attribute_proxy_test.rb", "test/attribute_test.rb", "test/factory_test.rb", "test/integration_test.rb", "test/models.rb", "test/sequence_test.rb", "test/test_helper.rb"]
+  s.extra_rdoc_files = ["README.rdoc"]
+  s.files = ["Changelog", "CONTRIBUTION_GUIDELINES.rdoc", "LICENSE", "Rakefile", "README.rdoc", "lib/factory_girl/aliases.rb", "lib/factory_girl/attribute/association.rb", "lib/factory_girl/attribute/dynamic.rb", "lib/factory_girl/attribute/static.rb", "lib/factory_girl/attribute.rb", "lib/factory_girl/factory.rb", "lib/factory_girl/proxy/attributes_for.rb", "lib/factory_girl/proxy/build.rb", "lib/factory_girl/proxy/create.rb", "lib/factory_girl/proxy/stub.rb", "lib/factory_girl/proxy.rb", "lib/factory_girl/sequence.rb", "lib/factory_girl/syntax/blueprint.rb", "lib/factory_girl/syntax/generate.rb", "lib/factory_girl/syntax/make.rb", "lib/factory_girl/syntax/sham.rb", "lib/factory_girl/syntax.rb", "lib/factory_girl.rb", "test/aliases_test.rb", "test/association_attribute_test.rb", "test/attribute_test.rb", "test/attributes_for_strategy_test.rb", "test/build_strategy_test.rb", "test/create_strategy_test.rb", "test/dynamic_attribute_test.rb", "test/factory_test.rb", "test/integration_test.rb", "test/models.rb", "test/sequence_test.rb", "test/static_attribute_test.rb", "test/strategy_test.rb", "test/stub_strategy_test.rb", "test/syntax/blueprint_test.rb", "test/syntax/generate_test.rb", "test/syntax/make_test.rb", "test/syntax/sham_test.rb", "test/test_helper.rb"]
   s.has_rdoc = true
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--main", "README.textile"]
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{factory_girl provides a framework and DSL for defining and using model instance factories.}
-  s.test_files = ["test/aliases_test.rb", "test/attribute_proxy_test.rb", "test/attribute_test.rb", "test/factory_test.rb", "test/integration_test.rb", "test/sequence_test.rb"]
+  s.test_files = ["test/aliases_test.rb", "test/association_attribute_test.rb", "test/attribute_test.rb", "test/attributes_for_strategy_test.rb", "test/build_strategy_test.rb", "test/create_strategy_test.rb", "test/dynamic_attribute_test.rb", "test/factory_test.rb", "test/integration_test.rb", "test/sequence_test.rb", "test/static_attribute_test.rb", "test/strategy_test.rb", "test/stub_strategy_test.rb", "test/syntax/blueprint_test.rb", "test/syntax/generate_test.rb", "test/syntax/make_test.rb", "test/syntax/sham_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION