diff --git a/Rakefile b/Rakefile
index dc97237..0ae782c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,24 +1,9 @@
-require 'rake'
-
-require 'jeweler'
-
-Jeweler::Tasks.new do |s|
-  s.name = "rest-client"
-  s.description = "A simple HTTP and REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete."
-  s.summary = "Simple HTTP and REST client for Ruby, inspired by microframework syntax for specifying actions."
-  s.authors = ["Adam Wiggins", "Julien Kirch"]
-  s.email = "rest.client@librelist.com"
-  s.homepage = "http://github.com/archiloque/rest-client"
-  s.files = FileList["[A-Z]*", "{bin,lib,spec}/**/*"]
-  s.test_files = FileList["{spec}/**/*"]
-  s.add_runtime_dependency("mime-types", ">= 1.16")
-  s.add_development_dependency("webmock", ">= 0.9.1")
-  s.add_development_dependency("rspec")
-  s.extra_rdoc_files = [ 'README.rdoc', 'history.md']
+begin
+  # optionally load `rake build/install/release tasks'
+  require 'bundler/gem_tasks'
+rescue LoadError
 end
 
-############################
-
 require "rspec/core/rake_task"
 
 desc "Run all specs"
diff --git a/VERSION b/VERSION
deleted file mode 100644
index 400084b..0000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.6.7
diff --git a/rest-client.gemspec b/rest-client.gemspec
index 8fe28fb..d4b7512 100644
--- a/rest-client.gemspec
+++ b/rest-client.gemspec
@@ -1,77 +1,21 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{rest-client}
-  s.version = "1.6.7"
+  s.name = 'rest-client'
+  s.version = '1.6.7'
+  s.authors = ['Adam Wiggins', 'Julien Kirch']
+  s.description = 'A simple HTTP and REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete.'
+  s.email = 'rest.client@librelist.com'
+  s.executables = ['restclient']
+  s.extra_rdoc_files = ["README.rdoc", "history.md"]
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- spec/*`.split("\n")
+  s.homepage = 'http://github.com/rest-client/rest-client'
+  s.summary = 'Simple HTTP and REST client for Ruby, inspired by microframework syntax for specifying actions.'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Adam Wiggins}, %q{Julien Kirch}]
-  s.date = %q{2011-08-24}
-  s.description = %q{A simple HTTP and REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete.}
-  s.email = %q{rest.client@librelist.com}
-  s.executables = [%q{restclient}]
-  s.extra_rdoc_files = [
-    "README.rdoc",
-    "history.md"
-  ]
-  s.files = [
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "bin/restclient",
-    "lib/rest-client.rb",
-    "lib/rest_client.rb",
-    "lib/restclient.rb",
-    "lib/restclient/abstract_response.rb",
-    "lib/restclient/exceptions.rb",
-    "lib/restclient/net_http_ext.rb",
-    "lib/restclient/payload.rb",
-    "lib/restclient/raw_response.rb",
-    "lib/restclient/request.rb",
-    "lib/restclient/resource.rb",
-    "lib/restclient/response.rb",
-    "spec/abstract_response_spec.rb",
-    "spec/base.rb",
-    "spec/exceptions_spec.rb",
-    "spec/integration/certs/equifax.crt",
-    "spec/integration/certs/verisign.crt",
-    "spec/integration/request_spec.rb",
-    "spec/integration_spec.rb",
-    "spec/master_shake.jpg",
-    "spec/payload_spec.rb",
-    "spec/raw_response_spec.rb",
-    "spec/request2_spec.rb",
-    "spec/request_spec.rb",
-    "spec/resource_spec.rb",
-    "spec/response_spec.rb",
-    "spec/restclient_spec.rb"
-  ]
-  s.homepage = %q{http://github.com/rest-client/rest-client}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{Simple HTTP and REST client for Ruby, inspired by microframework syntax for specifying actions.}
-  s.test_files = [%q{spec/abstract_response_spec.rb}, %q{spec/base.rb}, %q{spec/exceptions_spec.rb}, %q{spec/integration}, %q{spec/integration/certs}, %q{spec/integration/certs/equifax.crt}, %q{spec/integration/certs/verisign.crt}, %q{spec/integration/request_spec.rb}, %q{spec/integration_spec.rb}, %q{spec/master_shake.jpg}, %q{spec/payload_spec.rb}, %q{spec/raw_response_spec.rb}, %q{spec/request2_spec.rb}, %q{spec/request_spec.rb}, %q{spec/resource_spec.rb}, %q{spec/response_spec.rb}, %q{spec/restclient_spec.rb}]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
-      s.add_development_dependency(%q<webmock>, [">= 0.9.1"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0"])
-    else
-      s.add_dependency(%q<mime-types>, [">= 1.16"])
-      s.add_dependency(%q<webmock>, [">= 0.9.1"])
-      s.add_dependency(%q<rspec>, [">= 2.0"])
-    end
-  else
-    s.add_dependency(%q<mime-types>, [">= 1.16"])
-    s.add_dependency(%q<webmock>, [">= 0.9.1"])
-    s.add_dependency(%q<rspec>, [">= 2.0"])
-  end
+  s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
+  s.add_development_dependency(%q<webmock>, [">= 0.9.1"])
+  s.add_development_dependency(%q<rspec>, [">= 2.0"])
   s.add_dependency(%q<netrc>, ["~> 0.7.7"])
 end