core/modules/link/config/schema/link.schema.yml                       | 3 +++
 core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php   | 4 +++-
 core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/modules/link/config/schema/link.schema.yml b/core/modules/link/config/schema/link.schema.yml
index 7983652..6bc7ddc 100644
--- a/core/modules/link/config/schema/link.schema.yml
+++ b/core/modules/link/config/schema/link.schema.yml
@@ -46,6 +46,9 @@ field.field_settings.link:
     title:
       type: integer
       label: 'Allow link text'
+    description:
+      type: integer
+      label: 'Allow link description'
     link_type:
       type: integer
       label: 'Allowed link type'
diff --git a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
index 4686285..ed19a47 100644
--- a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
+++ b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
@@ -234,7 +234,9 @@ public function viewElements(FieldItemListInterface $items) {
           unset($item->_attributes);
         }
 
-        $element[$delta]['#options']['attributes']['title'] = $link_description;
+        if (!empty($link_description)) {
+          $element[$delta]['#options']['attributes']['title'] = $link_description;
+        }
       }
     }
 
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php
index dc4d2c8..3cfdb64 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php
@@ -144,7 +144,7 @@ public function testFieldInstanceSettings() {
     // Test a link field.
     $field = FieldConfig::load('node.story.field_test_link');
     $this->assertEqual($field->label(), 'Link Field');
-    $expected = array('title' => 2, 'link_type' => LinkItemInterface::LINK_GENERIC);
+    $expected = array('title' => 2, 'description' => DRUPAL_OPTIONAL, 'link_type' => LinkItemInterface::LINK_GENERIC);
     $this->assertEqual($field->getSettings(), $expected);
     $this->assertEqual('default link title', $entity->field_test_link->title, 'Field field_test_link default title is correct.');
     $this->assertEqual('http://drupal.org', $entity->field_test_link->url, 'Field field_test_link default title is correct.');