diff --git a/lib/docs/filters/django/clean_html.rb b/lib/docs/filters/django/clean_html.rb
index dfb26a14..b036009d 100644
--- a/lib/docs/filters/django/clean_html.rb
+++ b/lib/docs/filters/django/clean_html.rb
@@ -27,7 +27,7 @@ module Docs
 
         css('div[class^="highlight-"]').each do |node|
           node.name = 'pre'
-          node['class'] = case node['class']
+          node['class'] = node['data-language'] = case node['class']
             when 'highlight-python' then 'python'
             when 'highlight-html+django' then 'markup'
             else ''
@@ -35,6 +35,10 @@ module Docs
           node.content = node.at_css('pre').content
         end
 
+        css('code > code').each do |node|
+          node.before(node.children).remove
+        end
+
         doc
       end
     end
diff --git a/lib/docs/scrapers/django.rb b/lib/docs/scrapers/django.rb
index dd3d24f0..adaff5a7 100644
--- a/lib/docs/scrapers/django.rb
+++ b/lib/docs/scrapers/django.rb
@@ -35,13 +35,13 @@ module Docs
     HTML
 
     version '1.9' do
-      self.release = '1.9.4'
+      self.release = '1.9.7'
       self.dir = '/Users/Thibaut/DevDocs/Docs/Django19'
       self.base_url = 'https://docs.djangoproject.com/en/1.9/'
     end
 
     version '1.8' do
-      self.release = '1.8.11'
+      self.release = '1.8.13'
       self.dir = '/Users/Thibaut/DevDocs/Docs/Django18'
       self.base_url = 'https://docs.djangoproject.com/en/1.8/'
     end