diff --git a/Gemfile b/Gemfile
index bf8a8cc..e51adbb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ group :development, :test do
   gem 'rspec',        '~> 2.6'
   gem 'rspec-rails',  '~> 2.6'
   gem 'rspec-core',   '~> 2.6'
-  gem 'rdoc',         '~> 2.4'
+  gem 'rdoc',         '~> 3.12'
   gem 'rr',           '~> 1.0'
   gem 'ruby-debug',   :platform => :ruby_18
   gem 'ruby-debug19', '~> 0.11', :platform => :ruby_19
diff --git a/Gemfile.lock b/Gemfile.lock
index 08d92df..ad2e182 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,6 +47,7 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    json (1.8.6)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     linecache19 (0.5.12)
@@ -79,7 +80,8 @@ GEM
       thor (~> 0.14.4)
     rake (0.9.2)
     rbx-require-relative (0.0.5)
-    rdoc (2.5.11)
+    rdoc (3.12.1)
+      json (~> 1.4)
     rr (1.0.2)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
@@ -121,7 +123,7 @@ DEPENDENCIES
   coffee-script (~> 2.2)
   jeweler (~> 1.0)
   rails (~> 3.0)
-  rdoc (~> 2.4)
+  rdoc (~> 3.12)
   rr (~> 1.0)
   rspec (~> 2.6)
   rspec-core (~> 2.6)
diff --git a/barista.gemspec b/barista.gemspec
index 93eb1a1..880fb7f 100644
--- a/barista.gemspec
+++ b/barista.gemspec
@@ -68,7 +68,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["~> 2.6"])
       s.add_development_dependency(%q<rspec-rails>, ["~> 2.6"])
       s.add_development_dependency(%q<rspec-core>, ["~> 2.6"])
-      s.add_development_dependency(%q<rdoc>, ["~> 2.4"])
+      s.add_development_dependency(%q<rdoc>, "~> 3.12")
       s.add_development_dependency(%q<rr>, ["~> 1.0"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug19>, ["~> 0.11"])
@@ -79,7 +79,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, ["~> 2.6"])
       s.add_dependency(%q<rspec-rails>, ["~> 2.6"])
       s.add_dependency(%q<rspec-core>, ["~> 2.6"])
-      s.add_dependency(%q<rdoc>, ["~> 2.4"])
+      s.add_dependency(%q<rdoc>, "~> 3.12")
       s.add_dependency(%q<rr>, ["~> 1.0"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<ruby-debug19>, ["~> 0.11"])
@@ -91,7 +91,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, ["~> 2.6"])
     s.add_dependency(%q<rspec-rails>, ["~> 2.6"])
     s.add_dependency(%q<rspec-core>, ["~> 2.6"])
-    s.add_dependency(%q<rdoc>, ["~> 2.4"])
+    s.add_dependency(%q<rdoc>, "~> 3.12")
     s.add_dependency(%q<rr>, ["~> 1.0"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<ruby-debug19>, ["~> 0.11"])