diff --git a/.gitignore b/.gitignore
index 2318685..e1d9273 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 html/*
 pkg
 *.swp
+couchrest.gemspec
diff --git a/Rakefile b/Rakefile
index f9b809b..51b4973 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,9 +1,7 @@
 require 'rake'
 require "rake/rdoctask"
-require 'rake/gempackagetask'
 require File.join(File.expand_path(File.dirname(__FILE__)),'lib','couchrest')
 
-
 begin
   require 'spec/rake/spectask'
 rescue LoadError
@@ -14,41 +12,26 @@ EOS
   exit(0)
 end
 
-spec = Gem::Specification.new do |s|
-  s.name = "couchrest"
-  s.version = CouchRest::VERSION
-  s.date = "2008-11-22"
-  s.summary = "Lean and RESTful interface to CouchDB."
-  s.email = "jchris@apache.org"
-  s.homepage = "http://github.com/couchrest/couchrest"
-  s.description = "CouchRest provides a simple interface on top of CouchDB's RESTful HTTP API, as well as including some utility scripts for managing views and attachments."
-  s.has_rdoc = true
-  s.authors = ["J. Chris Anderson", "Matt Aimonetti"]
-  s.files = %w( LICENSE README.md Rakefile THANKS.md history.txt) + 
-    Dir["{examples,lib,spec,utils}/**/*"] - 
-    Dir["spec/tmp"]
-  s.extra_rdoc_files = %w( README.md LICENSE THANKS.md )
-  s.require_path = "lib"
-  s.add_dependency("rest-client", ">= 0.5")
-  s.add_dependency("mime-types", ">= 1.15")
-end
-
-
-desc "Create .gemspec file (useful for github)"
-task :gemspec do
-  filename = "#{spec.name}.gemspec"
-  File.open(filename, "w") do |f|
-    f.puts spec.to_ruby
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "couchrest"
+    gemspec.summary = "Lean and RESTful interface to CouchDB."
+    gemspec.description = "CouchRest provides a simple interface on top of CouchDB's RESTful HTTP API, as well as including some utility scripts for managing views and attachments."
+    gemspec.email = "jchris@apache.org"
+    gemspec.homepage = "http://github.com/couchrest/couchrest"
+    gemspec.authors = ["J. Chris Anderson", "Matt Aimonetti", "Marcos Tapajos"]
+    gemspec.extra_rdoc_files = %w( README.md LICENSE THANKS.md )
+    gemspec.files = %w( LICENSE README.md Rakefile THANKS.md history.txt) + Dir["{examples,lib,spec,utils}/**/*"] - Dir["spec/tmp"]
+    gemspec.has_rdoc = true
+    gemspec.add_dependency("rest-client", ">= 0.5")
+    gemspec.add_dependency("mime-types", ">= 1.15")
+    gemspec.version = CouchRest::VERSION
+    gemspec.date = "2008-11-22"
+    gemspec.require_path = "lib"
   end
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "Install the gem locally"
-task :install => [:package] do
-  sh %{sudo gem install pkg/couchrest-#{CouchRest::VERSION}}
+rescue LoadError
+  puts "Jeweler not available. Install it with: gem install jeweler"
 end
 
 desc "Run all specs"
diff --git a/couchrest.gemspec b/couchrest.gemspec
deleted file mode 100644
index 6ff0d37..0000000
--- a/couchrest.gemspec
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{couchrest}
-  s.version = "0.33"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["J. Chris Anderson", "Matt Aimonetti"]
-  s.date = %q{2008-11-22}
-  s.description = %q{CouchRest provides a simple interface on top of CouchDB's RESTful HTTP API, as well as including some utility scripts for managing views and attachments.}
-  s.email = %q{jchris@apache.org}
-  s.extra_rdoc_files = ["README.md", "LICENSE", "THANKS.md"]
-  s.files = ["LICENSE", "README.md", "Rakefile", "THANKS.md", "history.txt", "examples/model", "examples/model/example.rb", "examples/word_count", "examples/word_count/markov", "examples/word_count/views", "examples/word_count/views/books", "examples/word_count/views/books/chunked-map.js", "examples/word_count/views/books/united-map.js", "examples/word_count/views/markov", "examples/word_count/views/markov/chain-map.js", "examples/word_count/views/markov/chain-reduce.js", "examples/word_count/views/word_count", "examples/word_count/views/word_count/count-map.js", "examples/word_count/views/word_count/count-reduce.js", "examples/word_count/word_count.rb", "examples/word_count/word_count_query.rb", "examples/word_count/word_count_views.rb", "lib/couchrest", "lib/couchrest/commands", "lib/couchrest/commands/generate.rb", "lib/couchrest/commands/push.rb", "lib/couchrest/core", "lib/couchrest/core/adapters", "lib/couchrest/core/adapters/restclient.rb", "lib/couchrest/core/database.rb", "lib/couchrest/core/design.rb", "lib/couchrest/core/document.rb", "lib/couchrest/core/http_abstraction.rb", "lib/couchrest/core/response.rb", "lib/couchrest/core/rest_api.rb", "lib/couchrest/core/server.rb", "lib/couchrest/core/view.rb", "lib/couchrest/helper", "lib/couchrest/helper/pager.rb", "lib/couchrest/helper/streamer.rb", "lib/couchrest/helper/upgrade.rb", "lib/couchrest/middlewares", "lib/couchrest/middlewares/logger.rb", "lib/couchrest/mixins", "lib/couchrest/mixins/attachments.rb", "lib/couchrest/mixins/callbacks.rb", "lib/couchrest/mixins/class_proxy.rb", "lib/couchrest/mixins/collection.rb", "lib/couchrest/mixins/design_doc.rb", "lib/couchrest/mixins/document_queries.rb", "lib/couchrest/mixins/extended_attachments.rb", "lib/couchrest/mixins/extended_document_mixins.rb", "lib/couchrest/mixins/properties.rb", "lib/couchrest/mixins/validation.rb", "lib/couchrest/mixins/views.rb", "lib/couchrest/mixins.rb", "lib/couchrest/monkeypatches.rb", "lib/couchrest/more", "lib/couchrest/more/casted_model.rb", "lib/couchrest/more/extended_document.rb", "lib/couchrest/more/property.rb", "lib/couchrest/support", "lib/couchrest/support/blank.rb", "lib/couchrest/support/class.rb", "lib/couchrest/support/rails.rb", "lib/couchrest/validation", "lib/couchrest/validation/auto_validate.rb", "lib/couchrest/validation/contextual_validators.rb", "lib/couchrest/validation/validation_errors.rb", "lib/couchrest/validation/validators", "lib/couchrest/validation/validators/absent_field_validator.rb", "lib/couchrest/validation/validators/confirmation_validator.rb", "lib/couchrest/validation/validators/format_validator.rb", "lib/couchrest/validation/validators/formats", "lib/couchrest/validation/validators/formats/email.rb", "lib/couchrest/validation/validators/formats/url.rb", "lib/couchrest/validation/validators/generic_validator.rb", "lib/couchrest/validation/validators/length_validator.rb", "lib/couchrest/validation/validators/method_validator.rb", "lib/couchrest/validation/validators/numeric_validator.rb", "lib/couchrest/validation/validators/required_field_validator.rb", "lib/couchrest.rb", "spec/couchrest", "spec/couchrest/core", "spec/couchrest/core/couchrest_spec.rb", "spec/couchrest/core/database_spec.rb", "spec/couchrest/core/design_spec.rb", "spec/couchrest/core/document_spec.rb", "spec/couchrest/core/server_spec.rb", "spec/couchrest/helpers", "spec/couchrest/helpers/pager_spec.rb", "spec/couchrest/helpers/streamer_spec.rb", "spec/couchrest/more", "spec/couchrest/more/casted_extended_doc_spec.rb", "spec/couchrest/more/casted_model_spec.rb", "spec/couchrest/more/extended_doc_attachment_spec.rb", "spec/couchrest/more/extended_doc_spec.rb", "spec/couchrest/more/extended_doc_subclass_spec.rb", "spec/couchrest/more/extended_doc_view_spec.rb", "spec/couchrest/more/property_spec.rb", "spec/fixtures", "spec/fixtures/attachments", "spec/fixtures/attachments/couchdb.png", "spec/fixtures/attachments/README", "spec/fixtures/attachments/test.html", "spec/fixtures/more", "spec/fixtures/more/article.rb", "spec/fixtures/more/card.rb", "spec/fixtures/more/cat.rb", "spec/fixtures/more/course.rb", "spec/fixtures/more/event.rb", "spec/fixtures/more/invoice.rb", "spec/fixtures/more/person.rb", "spec/fixtures/more/question.rb", "spec/fixtures/more/service.rb", "spec/fixtures/views", "spec/fixtures/views/lib.js", "spec/fixtures/views/test_view", "spec/fixtures/views/test_view/lib.js", "spec/fixtures/views/test_view/only-map.js", "spec/fixtures/views/test_view/test-map.js", "spec/fixtures/views/test_view/test-reduce.js", "spec/spec.opts", "spec/spec_helper.rb", "utils/remap.rb", "utils/subset.rb"]
-  s.has_rdoc = true
-  s.homepage = %q{http://github.com/jchris/couchrest}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{Lean and RESTful interface to CouchDB.}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-client>, [">= 0.5"])
-      s.add_runtime_dependency(%q<mime-types>, [">= 1.15"])
-    else
-      s.add_dependency(%q<rest-client>, [">= 0.5"])
-      s.add_dependency(%q<mime-types>, [">= 1.15"])
-    end
-  else
-    s.add_dependency(%q<rest-client>, [">= 0.5"])
-    s.add_dependency(%q<mime-types>, [">= 1.15"])
-  end
-end
diff --git a/github_gemtest.rb b/github_gemtest.rb
deleted file mode 100644
index f15aa0b..0000000
--- a/github_gemtest.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-require 'yaml'
-
-if ARGV.size < 1
-  puts "Usage: github-test.rb my-project.gemspec"
-  exit
-end
-
-require 'rubygems/specification'
-data = File.read(ARGV[0])
-spec = nil
-
-if data !~ %r{!ruby/object:Gem::Specification}
-  Thread.new { spec = eval("$SAFE = 3\n#{data}") }.join
-else
-  spec = YAML.load(data)
-end
-
-puts spec
-puts "OK"
\ No newline at end of file
diff --git a/make-gemspec.sh b/make-gemspec.sh
deleted file mode 100755
index cd79b64..0000000
--- a/make-gemspec.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-git clean -fxd
-rake gemspec
\ No newline at end of file