diff --git a/Manifest b/Manifest
deleted file mode 100644
index cda1a76..0000000
--- a/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-Rakefile
-lib/citier.rb
-lib/citier/acts_as_citier.rb
-lib/citier/child_instance_methods.rb
-lib/citier/class_methods.rb
-lib/citier/core_ext.rb
-lib/citier/instance_methods.rb
-lib/citier/root_instance_methods.rb
-lib/citier/sql_adapters.rb
-lib/citier/relation_methods.rb
-Manifest
diff --git a/README.md b/README.md
index 10ba90d..255a30a 100644
--- a/README.md
+++ b/README.md
@@ -91,4 +91,20 @@ Cool huh?
 It is based on original code by ALTRABio (www.github.com/altrabio/)
 
 **For full information please go to the github page:**
-**http://peterhamilton.github.com/citier/**
\ No newline at end of file
+**http://peterhamilton.github.com/citier/**
+
+Contributing to citier
+----------------------
+
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
+* Fork the project.
+* Start a feature/bugfix branch.
+* Commit and push until you are happy with your contribution.
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+Copyright
+---------
+Copyright (c) 2012 Peter Hamilton. See LICENSE.txt for
+further details.
\ No newline at end of file
diff --git a/Rakefile b/Rakefile
index 2d4c520..45ae46f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,14 +1,53 @@
+# encoding: utf-8
+
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'rake'
 
-Gem::Specification.new do |s|
-  s.name            = 'citier'
-  s.version         = '0.1.15'
-  s.date            = '2012-01-26'
-  s.summary         = "CITIER (Class Inheritance & Table Inheritance Embeddings for Rails)"
-  s.description     = "A solution for single and multiple class table inheritance."
-  s.homepage        = "https://github.com/peterhamilton/citier/"
-  s.authors         = ["Peter Hamilton"]
-  s.email           = "peter@inspiredpixel.net"
-  s.ignore_pattern  = ["tmp/*", "script/*", 'doc/*']
-end
\ No newline at end of file
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "citier"
+  gem.homepage = "http://github.com/peterhamilton/citier"
+  gem.license = "MIT"
+  gem.summary = %Q{A solution for single and multiple class table inheritance.}
+  gem.description = %Q{CITIER (Class Inheritance & Table Inheritance Embeddings for Rails)}
+  gem.email = "peter@inspiredpixel.net"
+  gem.authors = ["Peter Hamilton"]
+  # dependencies defined in Gemfile
+end
+Jeweler::RubygemsDotOrgTasks.new
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+require 'rcov/rcovtask'
+Rcov::RcovTask.new do |test|
+  test.libs << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+  test.rcov_opts << '--exclude "gems/*"'
+end
+
+task :default => :test
+
+require 'rdoc/task'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "citier #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end