diff --git a/.travis.yml b/.travis.yml
index 780b2c0..d235f03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
 language: ruby
 
 rvm:
+  - 1.8.7
   - 1.9.3
+  - 2.0.0
+  - ruby-head
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/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000..f70502a
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,20 @@
+PATH
+  remote: .
+  specs:
+    columnize (0.8.9)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    json (1.8.0)
+    rake (10.0.4)
+    rdoc (4.0.1)
+      json (~> 1.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  columnize!
+  rake
+  rdoc
diff --git a/columnize.gemspec b/columnize.gemspec
index a4e2e60..6ad5267 100644
--- a/columnize.gemspec
+++ b/columnize.gemspec
@@ -1,9 +1,9 @@
 # -*- Ruby -*-
 # -*- encoding: utf-8 -*-
 require 'rake'
-require 'rubygems' unless 
+require 'rubygems' unless
   Object.const_defined?(:Gem)
-require File.dirname(__FILE__) + "/lib/columnize/version" unless 
+require File.dirname(__FILE__) + "/lib/columnize/version" unless
   Object.const_defined?(:'Columnize')
 
 Gem::Specification.new do |spec|
@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description  = '
 In showing a long lists, sometimes one would prefer to see the value
 arranged aligned in columns. Some examples include listing methods
-of an object or debugger commands. 
+of an object or debugger commands.
 See Examples in the rdoc documentation for examples.
 '
   spec.email        = 'rockyb@rubyforge.net'
@@ -33,4 +33,6 @@ See Examples in the rdoc documentation for examples.
   spec.rdoc_options += %w(--main README)
   spec.rdoc_options += ['--title', "Columnize #{Columnize::VERSION} Documentation"]
 
+  spec.add_development_dependency 'rdoc'
+  spec.add_development_dependency 'rake'
 end