diff --git a/core/modules/comment/comment.install b/core/modules/comment/comment.install
index 28b6b9d..8ca96b9 100644
--- a/core/modules/comment/comment.install
+++ b/core/modules/comment/comment.install
@@ -538,6 +538,9 @@ function comment_update_8006(&$sandbox) {
       'module' => 'comment',
       'name' => $field_name,
       'entity_type' => 'node',
+      'settings' => array(
+        'description' => sprintf('Allows commenting on the %s content type', $node_type),
+      ),
     );
     // Make sure field doesn't already exist.
     $index = 0;
diff --git a/core/modules/comment/lib/Drupal/comment/CommentManager.php b/core/modules/comment/lib/Drupal/comment/CommentManager.php
index 3816fc4..fb76df7 100644
--- a/core/modules/comment/lib/Drupal/comment/CommentManager.php
+++ b/core/modules/comment/lib/Drupal/comment/CommentManager.php
@@ -93,6 +93,9 @@ public function addDefaultField($entity_type, $bundle, $field_name = 'comment',
         'name' => $field_name,
         'type' => 'comment',
         'translatable' => '0',
+        'settings' => array(
+          'description' => 'Default comment field',
+        ),
       ));
       // Create the field.
       $field->save();
diff --git a/core/modules/comment/lib/Drupal/comment/Controller/AdminController.php b/core/modules/comment/lib/Drupal/comment/Controller/AdminController.php
index 451a62d..8692b5e 100644
--- a/core/modules/comment/lib/Drupal/comment/Controller/AdminController.php
+++ b/core/modules/comment/lib/Drupal/comment/Controller/AdminController.php
@@ -67,6 +67,7 @@ public function __construct(FieldInfo $field_info, CommentManagerInterface $comm
   public function overviewBundles() {
     $header = array(
       'field_name' => $this->t('Field name'),
+      'description' => $this->t('Description'),
       'usage' => array(
         'data' => $this->t('Used in'),
         'class' => array(RESPONSIVE_PRIORITY_MEDIUM),
@@ -105,6 +106,7 @@ public function overviewBundles() {
         );
         $row['data']['field_name']['data'] = $field_info->get('locked') ? $this->t('@label (@field_name) (Locked)', $tokens) : $this->t('@label (@field_name)', $tokens);
 
+        $row['data']['description']['data'] = $field_info->getFieldSetting('description');
         $row['data']['usage']['data'] = array(
           '#theme' => 'item_list',
           '#items' => array(),
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Field/FieldType/CommentItem.php b/core/modules/comment/lib/Drupal/comment/Plugin/Field/FieldType/CommentItem.php
index c91f1bb..cdb85db 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/Field/FieldType/CommentItem.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/Field/FieldType/CommentItem.php
@@ -17,6 +17,9 @@
  *   id = "comment",
  *   label = @Translation("Comments"),
  *   description = @Translation("This field manages configuration and presentation of comments on an entity."),
+ *   settings = {
+ *     "description" = "",
+ *   },
  *   instance_settings = {
  *     "default_mode" = COMMENT_MODE_THREADED,
  *     "per_page" = 50,
@@ -79,6 +82,20 @@ public function getPropertyDefinitions() {
   /**
    * {@inheritdoc}
    */
+  public function settingsForm(array $form, array &$form_state, $has_data) {
+    $element = array();
+
+    $element['description'] = array(
+      '#type' => 'textarea',
+      '#description' => t('Enter an administrative description for this field'),
+      '#default_value' => $this->getFieldSetting('description'),
+    );
+    return $element;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public static function schema(FieldInterface $field) {
     return array(
       'columns' => array(
diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentAdminTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentAdminTest.php
index a44b5c9..73ee327 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentAdminTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentAdminTest.php
@@ -156,6 +156,9 @@ public function testCommentAdmin() {
     // Make sure titles visible.
     $this->assertText('Field name');
     $this->assertText('Used in');
+    $this->assertText('Description');
+    // Make sure the description is present.
+    $this->assertText('Default comment field');
     // Manage fields.
     $this->clickLink('Manage fields');
     $this->assertResponse(200);