diff --git a/lib/docs/filters/drupal/entries.rb b/lib/docs/filters/drupal/entries.rb
index 9da70441e4..b0c99d917f 100644
--- a/lib/docs/filters/drupal/entries.rb
+++ b/lib/docs/filters/drupal/entries.rb
@@ -20,7 +20,7 @@ def get_type
         elsif subpath =~ /core!themes/
           'themes'
         else
-          css('.breadcrumb > a')[1].content
+          css('.breadcrumb a')[1].content
         end
       end
 
diff --git a/lib/docs/scrapers/drupal.rb b/lib/docs/scrapers/drupal.rb
index 3798caecf6..6c60d69648 100644
--- a/lib/docs/scrapers/drupal.rb
+++ b/lib/docs/scrapers/drupal.rb
@@ -4,13 +4,13 @@ class Drupal < UrlScraper
     self.base_url = 'https://api.drupal.org/api/drupal/'
     self.links = {
       home: 'https://www.drupal.org/',
-      code: 'http://cgit.drupalcode.org/drupal'
+      code: 'https://git.drupalcode.org/project/drupal'
     }
 
     html_filters.push 'drupal/entries', 'drupal/clean_html', 'title'
 
     options[:decode_and_clean_paths] = true
-    options[:container] = '#page-inner'
+    options[:container] = '#page'
     options[:title] = false
     options[:root_title] = 'Drupal'
 
@@ -38,34 +38,108 @@ class Drupal < UrlScraper
     ]
 
     options[:attribution] = <<-HTML
-      &copy; 2001&ndash;2016 by the original authors<br>
+      &copy; 2001&ndash;2022 by the original authors<br>
       Licensed under the GNU General Public License, version 2 and later.<br>
       Drupal is a registered trademark of Dries Buytaert.
     HTML
 
+    version '10' do
+      self.release = '10.0.0-alpha6'
+      self.root_path = '10.0.x'
+      self.initial_paths = %w(groups/10.0.x groups/10.0.x?page=1)
+
+      options[:only_patterns] = [
+        /\/class\/[^\/]+\/10\.0\.x\z/,
+        /\/group\/[^\/]+\/10\.0\.x\z/,
+        /\/function\/[^\/]+\/10\.0\.x\z/,
+        /\/constant\/[^\/]+\/10\.0\.x\z/,
+        /\/interface\/[^\/]+\/10\.0\.x\z/,
+        /\/property\/[^\/]+\/10\.0\.x\z/,
+        /\/global\/[^\/]+\/10\.0\.x\z/,
+        /\/trait\/[^\/]+\/10\.0\.x\z/,
+        /modules.*\/10\.0\.x\z/,
+        /includes.*\/10\.0\.x\z/,
+        /\A[\w\-\.]+\.php\/10\.0\.x\z/
+      ]
+
+      options[:skip] = %w(index.php/8.1.x update.php/10.0.x)
+
+      options[:skip_patterns] += [
+        /[^\w\-\.].*\.php\/10\.0\.x\z/,
+        /\!src\!/,
+        /migrate/,
+        /Assertion/,
+        /listing_page/,
+        /update_api/,
+        /vendor/,
+        /deprecated/,
+        /namespace/,
+        /\.yml/,
+        /Plugin/,
+        /\.theme\//
+      ]
+    end
+
+    version '9' do
+      self.release = '9.3.19'
+      self.root_path = '9.3.x'
+      self.initial_paths = %w(groups/9.3.x groups/9.3.x?page=1)
+
+      options[:only_patterns] = [
+        /\/class\/[^\/]+\/9\.3\.x\z/,
+        /\/group\/[^\/]+\/9\.3\.x\z/,
+        /\/function\/[^\/]+\/9\.3\.x\z/,
+        /\/constant\/[^\/]+\/9\.3\.x\z/,
+        /\/interface\/[^\/]+\/9\.3\.x\z/,
+        /\/property\/[^\/]+\/9\.3\.x\z/,
+        /\/global\/[^\/]+\/9\.3\.x\z/,
+        /\/trait\/[^\/]+\/9\.3\.x\z/,
+        /modules.*\/9\.3\.x\z/,
+        /includes.*\/9\.3\.x\z/,
+        /\A[\w\-\.]+\.php\/9\.3\.x\z/
+      ]
+
+      options[:skip] = %w(index.php/8.1.x update.php/9.3.x)
+
+      options[:skip_patterns] += [
+        /[^\w\-\.].*\.php\/9\.3\.x\z/,
+        /\!src\!/,
+        /migrate/,
+        /Assertion/,
+        /listing_page/,
+        /update_api/,
+        /vendor/,
+        /deprecated/,
+        /namespace/,
+        /\.yml/,
+        /Plugin/,
+        /\.theme\//
+      ]
+    end
+
     version '8' do
-      self.release = '8.1.7'
-      self.root_path = '8.1.x'
-      self.initial_paths = %w(groups/8.1.x groups/8.1.x?page=1)
+      self.release = '8.9.20'
+      self.root_path = '8.9.x'
+      self.initial_paths = %w(groups/8.9.x groups/8.9.x?page=1)
 
       options[:only_patterns] = [
-        /\/class\/[^\/]+\/8\.1\.x\z/,
-        /\/group\/[^\/]+\/8\.1\.x\z/,
-        /\/function\/[^\/]+\/8\.1\.x\z/,
-        /\/constant\/[^\/]+\/8\.1\.x\z/,
-        /\/interface\/[^\/]+\/8\.1\.x\z/,
-        /\/property\/[^\/]+\/8\.1\.x\z/,
-        /\/global\/[^\/]+\/8\.1\.x\z/,
-        /\/trait\/[^\/]+\/8\.1\.x\z/,
-        /modules.*\/8\.1\.x\z/,
-        /includes.*\/8\.1\.x\z/,
-        /\A[\w\-\.]+\.php\/8\.1\.x\z/
+        /\/class\/[^\/]+\/8\.9\.x\z/,
+        /\/group\/[^\/]+\/8\.9\.x\z/,
+        /\/function\/[^\/]+\/8\.9\.x\z/,
+        /\/constant\/[^\/]+\/8\.9\.x\z/,
+        /\/interface\/[^\/]+\/8\.9\.x\z/,
+        /\/property\/[^\/]+\/8\.9\.x\z/,
+        /\/global\/[^\/]+\/8\.9\.x\z/,
+        /\/trait\/[^\/]+\/8\.9\.x\z/,
+        /modules.*\/8\.9\.x\z/,
+        /includes.*\/8\.9\.x\z/,
+        /\A[\w\-\.]+\.php\/8\.9\.x\z/
       ]
 
-      options[:skip] = %w(index.php/8.1.x update.php/8.1.x)
+      options[:skip] = %w(index.php/8.9.x update.php/8.9.x)
 
       options[:skip_patterns] += [
-        /[^\w\-\.].*\.php\/8\.1\.x\z/,
+        /[^\w\-\.].*\.php\/8\.9\.x\z/,
         /\!src\!/,
         /migrate/,
         /Assertion/,
@@ -81,7 +155,7 @@ class Drupal < UrlScraper
     end
 
     version '7' do
-      self.release = '7.50'
+      self.release = '7.91'
       self.root_path = '7.x'
       self.initial_paths = %w(groups/7.x groups/7.x?page=1)