diff --git a/core/modules/block_content/block_content.permissions.yml b/core/modules/block_content/block_content.permissions.yml
new file mode 100644
index 0000000000..07194feaea
--- /dev/null
+++ b/core/modules/block_content/block_content.permissions.yml
@@ -0,0 +1,2 @@
+permission_callbacks:
+  - \Drupal\block_content\BlockContentTypePermissions::blockTypePermissions
\ No newline at end of file
diff --git a/core/modules/block_content/src/BlockContentAccessControlHandler.php b/core/modules/block_content/src/BlockContentAccessControlHandler.php
index 7079ef4849..001b4621b6 100644
--- a/core/modules/block_content/src/BlockContentAccessControlHandler.php
+++ b/core/modules/block_content/src/BlockContentAccessControlHandler.php
@@ -22,6 +22,12 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
       return AccessResult::allowedIf($entity->isPublished())->addCacheableDependency($entity)
         ->orIf(AccessResult::allowedIfHasPermission($account, 'administer blocks'));
     }
+    if ($operation === 'update') {
+      $perm = 'edit any ' . $entity->bundle() . ' block';
+      if ($account->hasPermission($perm)) {
+        return AccessResult::allowed();
+      }
+    }
     return parent::checkAccess($entity, $operation, $account);
   }
 
diff --git a/core/modules/block_content/src/BlockContentTypePermissions.php b/core/modules/block_content/src/BlockContentTypePermissions.php
new file mode 100644
index 0000000000..3de78928a2
--- /dev/null
+++ b/core/modules/block_content/src/BlockContentTypePermissions.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Drupal\block_content;
+
+use Drupal\block_content\Entity\BlockContentType;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+
+/**
+ * Provide dynamic permissions for blocks of different types.
+ */
+class BlockContentTypePermissions {
+
+  use StringTranslationTrait;
+
+  /**
+   * Build the all permissions for all the block types.
+   *
+   * @return array
+   *   The block type permissions.
+   *
+   * @see \Drupal\user\PermissionHandlerInterface::getPermissions()
+   */
+  public function blockTypePermissions() {
+    $perms = [];
+    // Generate permissions for all the types.
+    foreach (BlockContentType::loadMultiple() as $type) {
+      $perms += $this->buildPermission($type);
+    }
+
+    return $perms;
+  }
+
+  /**
+   * Return all the permissions available for all the custom block types.
+   *
+   * @param \Drupal\block_content\Entity\BlockContentType $type
+   *   The block entity.
+   *
+   * @return array
+   *   Permissions available for the given block.
+   */
+  public function buildPermission(BlockContentType $type) {
+    $type_id = $type->id();
+    $type_params = ['%type_name' => $type->label()];
+    return [
+      "edit any $type_id block" => [
+        'title' => $this->t('%type_name: Edit any content', $type_params),
+      ],
+    ];
+  }
+
+}