diff --git a/.gitignore b/.gitignore
index 49ce817..55827c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .idea
 pkg/
+/Gemfile.lock
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..fa75df1
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec
diff --git a/Rakefile b/Rakefile
index f4f537e..6f15ed3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -11,6 +11,11 @@ begin
     gem.homepage = "http://www.iron.io"
     gem.authors = ["Pat Nakajima", "Travis Reeder"]
     gem.add_dependency 'rack'
+    gem.add_development_dependency 'rake'
+    gem.add_development_dependency 'jeweler2'
+    gem.add_development_dependency 'rack-test'
+    gem.add_development_dependency 'sinatra', '<= 1.3.2'
+    gem.add_development_dependency 'bacon'
     # gem.required_ruby_version = '>= 1.9'
   end
   Jeweler::GemcutterTasks.new
diff --git a/rack-flash3.gemspec b/rack-flash3.gemspec
index 42b3b00..7331fdf 100644
--- a/rack-flash3.gemspec
+++ b/rack-flash3.gemspec
@@ -9,13 +9,14 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pat Nakajima", "Travis Reeder"]
-  s.date = "2012-03-27"
+  s.date = "2012-12-24"
   s.description = "Flash hash implementation for Rack apps."
   s.email = "treeder@gmail.com"
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.files = [
+    "Gemfile",
     "README.md",
     "Rakefile",
     "VERSION.yml",
@@ -33,7 +34,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://www.iron.io"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.21"
+  s.rubygems_version = "1.8.23"
   s.summary = "Flash hash implementation for Rack apps."
 
   if s.respond_to? :specification_version then
@@ -41,14 +42,29 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, [">= 0"])
-      s.add_runtime_dependency(%q<rack>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<jeweler2>, [">= 0"])
+      s.add_development_dependency(%q<rack-test>, [">= 0"])
+      s.add_development_dependency(%q<sinatra>, ["<= 1.3.2"])
+      s.add_development_dependency(%q<bacon>, [">= 0"])
+      s.add_runtime_dependency(%q<rack-flash3>, [">= 0"])
     else
       s.add_dependency(%q<rack>, [">= 0"])
-      s.add_dependency(%q<rack>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<jeweler2>, [">= 0"])
+      s.add_dependency(%q<rack-test>, [">= 0"])
+      s.add_dependency(%q<sinatra>, ["<= 1.3.2"])
+      s.add_dependency(%q<bacon>, [">= 0"])
+      s.add_dependency(%q<rack-flash3>, [">= 0"])
     end
   else
     s.add_dependency(%q<rack>, [">= 0"])
-    s.add_dependency(%q<rack>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<jeweler2>, [">= 0"])
+    s.add_dependency(%q<rack-test>, [">= 0"])
+    s.add_dependency(%q<sinatra>, ["<= 1.3.2"])
+    s.add_dependency(%q<bacon>, [">= 0"])
+    s.add_dependency(%q<rack-flash3>, [">= 0"])
   end
 end
 
diff --git a/test/helper.rb b/test/helper.rb
index 5fc901b..da4054a 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,5 +1,4 @@
 require 'rubygems'
-gem 'sinatra', '<=1.3.2'
 require 'sinatra/base'
 require 'bacon'
 require 'rack/test'
diff --git a/test/test_flash.rb b/test/test_flash.rb
index a670940..70aa382 100644
--- a/test/test_flash.rb
+++ b/test/test_flash.rb
@@ -1,10 +1,10 @@
 require File.dirname(__FILE__) + '/helper'
 
 describe 'Rack::Flash' do
-  include Rack::Test::Methods
+  extend Rack::Test::Methods
 
   def app(&block)
-    return Sinatra.new &block
+    return Sinatra.new block
   end
 
   before do