diff --git a/Gemfile b/Gemfile
new file mode 100644
index 00000000..0633f419
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,35 @@
+# Why use bundler?
+# Well, not all development dependencies install on all rubies. Moreover, `gem 
+# install sinatra --development` doesn't work, as it will also try to install
+# development dependencies of our dependencies, and those are not conflict free.
+# So, here we are, `bundle install`.
+#
+# If you have issues with on gem: `bundle install --without-coffee-script`.
+
+source :rubygems
+gemspec
+
+gem 'rake'
+gem 'rack-test', '>= 0.5.6'
+
+gem 'haml', '>= 3.0', :group => 'haml'
+gem 'builder', :group => 'builder'
+gem 'erubis', :group => 'erubis'
+gem 'less', :group => 'less'
+gem 'liquid', :group => 'liquid'
+gem 'RedCloth', :group => 'redcloth'
+gem 'rdoc', :group => 'rdoc'
+gem 'nokogiri', :group => 'nokogiri'
+gem 'slim', :group => 'slim'
+
+gem 'coffee-script', '>= 2.0', :group => 'coffee-script'
+
+platforms :ruby do
+  gem 'rdiscount', :group => 'rdiscount'
+end
+
+platforms :ruby_18, :jruby do
+  gem 'json', :group => 'coffee-script'
+  gem 'markaby', :group => 'markaby'
+  gem 'radius', :group => 'radius'
+end
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 00000000..54650f73
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,74 @@
+PATH
+  remote: .
+  specs:
+    sinatra (1.2.0.a)
+      rack (~> 1.1)
+      tilt (>= 1.2.2, < 2.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    RedCloth (4.2.7)
+    RedCloth (4.2.7-java)
+    abstract (1.0.0)
+    builder (3.0.0)
+    coffee-script (2.1.3)
+      coffee-script-source
+    coffee-script-source (1.0.1)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    haml (3.0.25)
+    json (1.5.1)
+    json (1.5.1-java)
+    less (1.2.21)
+      mutter (>= 0.4.2)
+      treetop (>= 1.4.2)
+    liquid (2.2.2)
+    markaby (0.7.1)
+      builder (>= 2.0.0)
+    mutter (0.5.3)
+    nokogiri (1.4.4)
+    nokogiri (1.4.4-java)
+      weakling (>= 0.0.3)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    radius (0.6.1)
+    rake (0.8.7)
+    rdiscount (1.6.8)
+    rdoc (3.5.3)
+    shotgun (0.8)
+      rack (>= 1.0)
+    slim (0.9.0)
+      temple (~> 0.1.7)
+      tilt (~> 1.2)
+    temple (0.1.7)
+    tilt (1.2.2)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    weakling (0.0.4-java)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  RedCloth
+  builder
+  coffee-script (>= 2.0)
+  erubis
+  haml (>= 3.0)
+  json
+  less
+  liquid
+  markaby
+  nokogiri
+  rack-test (>= 0.5.6)
+  radius
+  rake
+  rdiscount
+  rdoc
+  shotgun (~> 0.6)
+  sinatra!
+  slim
diff --git a/sinatra.gemspec b/sinatra.gemspec
index b527b3e9..120d5e26 100644
--- a/sinatra.gemspec
+++ b/sinatra.gemspec
@@ -118,22 +118,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w[README.rdoc README.de.rdoc README.jp.rdoc README.fr.rdoc README.es.rdoc README.hu.rdoc README.zh.rdoc LICENSE]
   s.add_dependency 'rack', '~> 1.1'
   s.add_dependency 'tilt', '>= 1.2.2', '< 2.0'
-  s.add_development_dependency 'rake'
   s.add_development_dependency 'shotgun', '~> 0.6'
-  s.add_development_dependency 'rack-test', '>= 0.5.6'
-  s.add_development_dependency 'haml', '>= 3.0'
-  s.add_development_dependency 'builder'
-  s.add_development_dependency 'erubis'
-  s.add_development_dependency 'less'
-  s.add_development_dependency 'liquid'
-  s.add_development_dependency 'rdiscount'
-  s.add_development_dependency 'RedCloth'
-  s.add_development_dependency 'radius'
-  s.add_development_dependency 'markaby'
-  s.add_development_dependency 'coffee-script', '>= 2.0'
-  s.add_development_dependency 'rdoc'
-  s.add_development_dependency 'nokogiri'
-  s.add_development_dependency 'slim'
 
   s.has_rdoc = true
   s.homepage = "http://sinatra.rubyforge.org"