diff --git a/.gitignore b/.gitignore
index d8efa07..6773655 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,4 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
 .bundle
+coverage
+pkg
+rdoc
diff --git a/Gemfile.lock b/Gemfile.lock
index 5f3f478..e589abc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_oauth (0.1.0)
+    simple_oauth (0.1.1)
 
 GEM
   remote: http://rubygems.org/
diff --git a/Rakefile b/Rakefile
index 4728f20..7084e16 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,26 +1,9 @@
-require './lib/simple_oauth'
-require 'rubygems'
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
+require 'bundler'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = 'simple_oauth'
-    gem.version = SimpleOAuth::Version::STRING
-    gem.summary = 'Simply builds and verifies OAuth headers'
-    gem.description = 'Simply builds and verifies OAuth headers'
-    gem.email = 'steve.richert@gmail.com'
-    gem.homepage = 'http://github.com/laserlemon/simple_oauth'
-    gem.authors = ['Steve Richert']
-    gem.add_development_dependency 'mocha'
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts 'Jeweler is not available. Install it with: gem install jeweler'
-end
+Bundler::GemHelper.install_tasks
 
 Rake::TestTask.new do |test|
   test.libs << 'lib' << 'test'
@@ -28,8 +11,6 @@ Rake::TestTask.new do |test|
   test.verbose = true
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
 begin
diff --git a/simple_oauth.gemspec b/simple_oauth.gemspec
index 57ff641..a2ec066 100644
--- a/simple_oauth.gemspec
+++ b/simple_oauth.gemspec
@@ -1,56 +1,18 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+require File.expand_path('../lib/simple_oauth', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = %q{simple_oauth}
-  s.version = "0.1.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Steve Richert"]
-  s.date = %q{2010-10-13}
-  s.description = %q{Simply builds and verifies OAuth headers}
-  s.email = %q{steve.richert@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "init.rb",
-     "lib/simple_oauth.rb",
-     "simple_oauth.gemspec",
-     "test/helper.rb",
-     "test/rsa_private_key",
-     "test/simple_oauth_test.rb"
-  ]
-  s.homepage = %q{http://github.com/laserlemon/simple_oauth}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Simply builds and verifies OAuth headers}
-  s.test_files = [
-    "test/helper.rb",
-     "test/simple_oauth_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-    else
-      s.add_dependency(%q<mocha>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<mocha>, [">= 0"])
-  end
+Gem::Specification.new do |spec|
+  spec.add_development_dependency('mocha', '>= 0')
+  spec.author = 'Steve Richert'
+  spec.description = 'Simply builds and verifies OAuth headers'
+  spec.email = 'steve.richert@gmail.com'
+  spec.extra_rdoc_files = ['README.rdoc']
+  spec.files = `git ls-files`.split("\n")
+  spec.homepage = 'http://github.com/laserlemon/simple_oauth'
+  spec.name = 'simple_oauth'
+  spec.rdoc_options = ['--charset=UTF-8']
+  spec.required_ruby_version = '>= 1.8.7'
+  spec.summary = 'Simply builds and verifies OAuth headers'
+  spec.test_files = `git ls-files -- test/**/*_test.rb`.split("\n")
+  spec.version = SimpleOAuth::Version::STRING
 end
-