diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Core/Entity/Vocabulary.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Core/Entity/Vocabulary.php
index abcb75b..55bcb7b 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Core/Entity/Vocabulary.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Core/Entity/Vocabulary.php
@@ -25,7 +25,8 @@
  *     "access" = "Drupal\taxonomy\VocabularyAccessController",
  *     "list" = "Drupal\taxonomy\VocabularyListController",
  *     "form" = {
- *       "default" = "Drupal\taxonomy\VocabularyFormController",
+ *       "add" = "Drupal\taxonomy\VocabularyFormController",
+ *       "edit" = "Drupal\taxonomy\VocabularyFormController",
  *       "reset" = "Drupal\taxonomy\Form\VocabularyResetForm",
  *       "delete" = "Drupal\taxonomy\Form\VocabularyDeleteForm"
  *     }
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Menu/LocalAction/VocabularyAdd.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Menu/LocalAction/VocabularyAdd.php
deleted file mode 100644
index cfe4452..0000000
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Menu/LocalAction/VocabularyAdd.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\taxonomy\Plugin\Menu\LocalAction\VocabularyAdd.
- */
-
-namespace Drupal\taxonomy\Plugin\Menu\LocalAction;
-
-use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Menu\LocalActionBase;
-use Drupal\Core\Annotation\Menu\LocalAction;
-
-/**
- * @LocalAction(
- *   id = "taxonomy_vocabulary_add",
- *   route_name = "taxonomy_vocabulary_add",
- *   title = @Translation("Add vocabulary"),
- *   appears_on = {"taxonomy_vocabulary_list"}
- * )
- */
-class VocabularyAdd extends LocalActionBase {
-
-} 
diff --git a/core/modules/taxonomy/taxonomy.local_actions.yml b/core/modules/taxonomy/taxonomy.local_actions.yml
new file mode 100644
index 0000000..a04a0ba
--- /dev/null
+++ b/core/modules/taxonomy/taxonomy.local_actions.yml
@@ -0,0 +1,5 @@
+taxonomy_add_vocabulary_local_action:
+  route_name: taxonomy_vocabulary_add
+  title: 'Add vocabulary'
+  appears_on:
+    - taxonomy_vocabulary_list
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index ef94bf1..a856878 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -241,7 +241,6 @@ function taxonomy_menu() {
     'type' => MENU_DEFAULT_LOCAL_TASK,
   );
   $items['admin/structure/taxonomy/add'] = array(
-    'title' => 'Add vocabulary',
     'route_name' => 'taxonomy_vocabulary_add',
     'type' => MENU_SIBLING_LOCAL_TASK,
   );
diff --git a/core/modules/taxonomy/taxonomy.routing.yml b/core/modules/taxonomy/taxonomy.routing.yml
index 4a06c97..e981682 100644
--- a/core/modules/taxonomy/taxonomy.routing.yml
+++ b/core/modules/taxonomy/taxonomy.routing.yml
@@ -22,9 +22,9 @@ taxonomy_term_delete:
 taxonomy_vocabulary_add:
   pattern: '/admin/structure/taxonomy/add'
   defaults:
-    _entity_form: 'taxonomy_vocabulary'
+    _entity_form: 'taxonomy_vocabulary.add'
   requirements:
-    _access_taxonomy_term_create: 'TRUE'
+    _entity_create_access: 'taxonomy_vocabulary'
 
 taxonomy_vocabulary_delete:
   pattern: '/admin/structure/taxonomy/manage/{taxonomy_vocabulary}/delete'