diff --git a/assets/javascripts/views/pages/javascript.coffee b/assets/javascripts/views/pages/javascript.coffee
index 619b5fe3..ccc3c471 100644
--- a/assets/javascripts/views/pages/javascript.coffee
+++ b/assets/javascripts/views/pages/javascript.coffee
@@ -27,7 +27,6 @@ app.views.MongoosePage =
 app.views.NodePage =
 app.views.PhaserPage =
 app.views.RamdaPage =
-app.views.RethinkdbPage =
 app.views.SinonPage =
 app.views.UnderscorePage =
 app.views.WebpackPage =
diff --git a/assets/javascripts/views/pages/simple.coffee b/assets/javascripts/views/pages/simple.coffee
index 579d3cdf..aeacd237 100644
--- a/assets/javascripts/views/pages/simple.coffee
+++ b/assets/javascripts/views/pages/simple.coffee
@@ -7,5 +7,6 @@ class app.views.SimplePage extends app.views.BasePage
     return
 
 app.views.MeteorPage =
+app.views.RethinkdbPage =
 app.views.TypescriptPage =
 app.views.SimplePage
diff --git a/lib/docs/filters/rethinkdb/clean_html.rb b/lib/docs/filters/rethinkdb/clean_html.rb
index 9ea75aa3..0d6e2eaf 100644
--- a/lib/docs/filters/rethinkdb/clean_html.rb
+++ b/lib/docs/filters/rethinkdb/clean_html.rb
@@ -31,6 +31,10 @@ module Docs
           node.name = 'h2'
         end
 
+        css('pre').each do |node|
+          node['data-language'] = current_url.path[/\A\/api\/(\w+)\//, 1]
+        end
+
         doc
       end
     end
diff --git a/lib/docs/filters/rethinkdb/entries.rb b/lib/docs/filters/rethinkdb/entries.rb
index e3fbc8f7..16186bc3 100644
--- a/lib/docs/filters/rethinkdb/entries.rb
+++ b/lib/docs/filters/rethinkdb/entries.rb
@@ -6,8 +6,8 @@ module Docs
       end
 
       def get_type
-        link = at_css('a[href^="https://github.com/rethinkdb/docs/blob/master/api/javascript/"]')
-        dir = link['href'][/javascript\/([^\/]+)/, 1]
+        link = at_css('a[href^="https://github.com/rethinkdb/docs/blob/master/api/"]')
+        dir = link['href'][/api\/\w+\/([^\/]+)/, 1]
         dir.titleize.gsub('Rql', 'ReQL').gsub('And', 'and')
       end
 
diff --git a/lib/docs/scrapers/rethinkdb.rb b/lib/docs/scrapers/rethinkdb.rb
index 7fac3da1..1c126cda 100644
--- a/lib/docs/scrapers/rethinkdb.rb
+++ b/lib/docs/scrapers/rethinkdb.rb
@@ -2,8 +2,7 @@ module Docs
   class Rethinkdb < UrlScraper
     self.name = 'RethinkDB'
     self.type = 'rethinkdb'
-    self.release = '2.2.5'
-    self.base_url = 'https://rethinkdb.com/api/javascript/'
+    self.release = '2.3.0'
     self.links = {
       home: 'https://rethinkdb.com/',
       code: 'https://github.com/rethinkdb/rethinkdb'
@@ -14,13 +13,41 @@ module Docs
     options[:trailing_slash] = false
     options[:container] = '.docs-article'
 
-    options[:fix_urls] = ->(url) do
-      url.sub! %r{rethinkdb.com/api/(?!javascript|ruby|python)}, 'rethinkdb.com/api/javascript/'
-    end
-
     options[:attribution] = <<-HTML
       &copy; RethinkDB contributors<br>
       Licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License.
     HTML
+
+    version 'JavaScript' do
+      self.base_url = 'https://rethinkdb.com/api/javascript/'
+
+      options[:fix_urls] = ->(url) do
+        url.sub! %r{rethinkdb.com/api/(?!javascript|ruby|python|java)}, 'rethinkdb.com/api/javascript/'
+      end
+    end
+
+    version 'Ruby' do
+      self.base_url = 'https://rethinkdb.com/api/ruby/'
+
+      options[:fix_urls] = ->(url) do
+        url.sub! %r{rethinkdb.com/api/(?!javascript|ruby|python|java)}, 'rethinkdb.com/api/ruby/'
+      end
+    end
+
+    version 'Python' do
+      self.base_url = 'https://rethinkdb.com/api/python/'
+
+      options[:fix_urls] = ->(url) do
+        url.sub! %r{rethinkdb.com/api/(?!javascript|ruby|python|java)}, 'rethinkdb.com/api/python/'
+      end
+    end
+
+    version 'Java' do
+      self.base_url = 'https://rethinkdb.com/api/java/'
+
+      options[:fix_urls] = ->(url) do
+        url.sub! %r{rethinkdb.com/api/(?!javascript|ruby|python|java)}, 'rethinkdb.com/api/java/'
+      end
+    end
   end
 end