diff --git a/lib/docs/filters/chef/entries.rb b/lib/docs/filters/chef/entries.rb
index 3c28a2eb..311ea769 100644
--- a/lib/docs/filters/chef/entries.rb
+++ b/lib/docs/filters/chef/entries.rb
@@ -10,16 +10,22 @@ module Docs
       end
 
       CLIENT_TYPE_BY_SLUG_END_WITH = {
-        'knife_common_options'               => 'Knife Commands',
-        'knife_using'                        => 'Knife Commands',
-        'resource_common'                    => 'Chef Resources',
-        'config_rb_knife_optional_settings'  => 'Config Files'
+        'knife_common_options'               => 'Workflow Tools',
+        'knife_using'                        => 'Workflow Tools',
+        'resource_common'                    => 'Cookbooks',
+        'config_rb_knife_optional_settings'  => 'Workflow Tools',
+        'knife_index_rebuild'                => 'Workflow Tools',
+        'handlers'                           => 'Extend Chef',
+        'dsl_recipe'                         => 'Extend Chef',
+        'resource'                           => 'Extend Chef'
       }
 
       SERVER_TYPE_BY_SLUG_END_WITH = {
         'auth'                               => 'Theory & Concepts',
+        'install_server'                     => 'Setup & Config',
         'install_server_pre'                 => 'Setup & Config',
-        'config_rb_server_optional_settings' => 'Config Files'
+        'config_rb_server_optional_settings' => 'Manage the Server',
+        'ctl_chef_server'                    => 'Manage the Server'
       }
 
       def get_type
diff --git a/lib/docs/scrapers/chef.rb b/lib/docs/scrapers/chef.rb
index 4a9f026e..72c66c67 100644
--- a/lib/docs/scrapers/chef.rb
+++ b/lib/docs/scrapers/chef.rb
@@ -13,7 +13,8 @@ module Docs
       /\A[^\/]+\/\z/,
       /\A[^\/]+\/index\.html\z/,
       /\A[^\/]+\/release_notes\.html\z/,
-      /\Aserver[^\/]+\/chef_overview\.html\z/ ]
+      /\Aserver[^\/]+\/chef_overview\.html\z/,
+      /\A[\d\-]+\/server_components\.html\z/ ]
 
     options[:attribution] = <<-HTML
       &copy; Chef Software, Inc.<br>
@@ -24,10 +25,10 @@ module Docs
     HTML
 
     version '12' do
-      self.release = '12.9'
+      self.release = '12.13'
 
-      options[:client_path] = client_path = '12-9'
-      options[:server_path] = server_path = 'server_12-5'
+      options[:client_path] = client_path = '12-13'
+      options[:server_path] = server_path = 'server_12-8'
 
       self.root_path = "#{client_path}/chef_overview.html"
       self.initial_paths = ["#{server_path}/server_components.html"]
@@ -39,7 +40,7 @@ module Docs
       self.release = '11.18'
 
       options[:client_path] = client_path = '11-18'
-      options[:server_path] = server_path = 'server_12-5'
+      options[:server_path] = server_path = 'server_12-8'
 
       self.root_path = "#{client_path}/chef_overview.html"
       self.initial_paths = ["#{server_path}/server_components.html"]