diff --git a/core/modules/block_content/block_content.services.yml b/core/modules/block_content/block_content.services.yml
new file mode 100644
index 0000000..ed47e4c
--- /dev/null
+++ b/core/modules/block_content/block_content.services.yml
@@ -0,0 +1,6 @@
+services:
+  block_content.breadcrumb:
+    class: Drupal\block_content\BlockContentBreadcrumbBuilder
+    tags:
+      - { name: breadcrumb_builder, priority: 100 }
+    arguments: ['@entity.manager']
diff --git a/core/modules/block_content/src/BlockContentBreadcrumbBuilder.php b/core/modules/block_content/src/BlockContentBreadcrumbBuilder.php
new file mode 100644
index 0000000..da6ee6e
--- /dev/null
+++ b/core/modules/block_content/src/BlockContentBreadcrumbBuilder.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\block_content\BlockContentBreadcrumbBuilder.
+ */
+
+namespace Drupal\block_content;
+
+use Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Routing\LinkGeneratorTrait;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+
+/**
+ * Provides a breadcrumb builder for block add/edit pages.
+ */
+class BlockContentBreadcrumbBuilder implements BreadcrumbBuilderInterface {
+  use StringTranslationTrait;
+  use LinkGeneratorTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function applies(RouteMatchInterface $route_match) {
+   return $route_match->getRouteName() == 'block_content.add_page'
+     || $route_match->getRouteName() == 'block_content.edit';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function build(RouteMatchInterface $route_match) {
+    $breadcrumb = array();
+
+    $breadcrumb[] = $this->l($this->t('Home'), '<front>');
+    $breadcrumb[] = $this->l($this->t('Administration'), 'system.admin');
+    $breadcrumb[] = $this->l($this->t('Structure'), 'system.admin_structure');
+    $breadcrumb[] = $this->l($this->t('Block Layout'), 'block.admin_display');
+    $breadcrumb[] = $this->l($this->t('Custom Block Library'), 'block_content.list');
+    return $breadcrumb;
+  }
+}