diff --git a/core/modules/migrate_drupal/src/Plugin/CckFieldMigrateSourceInterface.php b/core/modules/migrate_drupal/src/Plugin/CckFieldMigrateSourceInterface.php
index 6cdea25..45a4ebc 100644
--- a/core/modules/migrate_drupal/src/Plugin/CckFieldMigrateSourceInterface.php
+++ b/core/modules/migrate_drupal/src/Plugin/CckFieldMigrateSourceInterface.php
@@ -1,5 +1,10 @@
 <?php
 
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal\Plugin\CckFieldMigrateSourceInterface.
+ */
+
 namespace Drupal\migrate_drupal\Plugin;
 
 use Drupal\migrate\Plugin\MigrateSourceInterface;
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/load/LoadEntity.php b/core/modules/migrate_drupal/src/Plugin/migrate/load/LoadEntity.php
index 0702342..e8212dc 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/load/LoadEntity.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/load/LoadEntity.php
@@ -15,7 +15,6 @@
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\SourceEntityInterface;
 use Drupal\migrate_drupal\Plugin\MigrateLoadInterface;
-use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\migrate_drupal\Plugin\CckFieldMigrateSourceInterface;
 
 /**
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/CckLink.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/CckLink.php
index 56bddec..4cb59f0 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/CckLink.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/CckLink.php
@@ -25,10 +25,15 @@ class CckLink extends Route implements ContainerFactoryPluginInterface {
   public function transform($value, MigrateExecutable $migrate_executable, Row $row, $destination_property) {
     list($url, $title, $attributes) = $value;
 
-    // @TODO, WTF, D6 double serializes the attributes?
+    // Drupal 6 link attributes are double serialized.
     $attributes = unserialize(unserialize($attributes));
-    $route_plugin_value = [$url, $attributes];
+    $route_plugin_value = [$url, []];
     $route = parent::transform($route_plugin_value, $migrate_executable, $row, $destination_property);
+
+    // Massage the values into the correct form for the link.
+    $route['options']['attributes'] = $attributes;
+    // External links do not have a route name.
+    $route['options']['external'] = empty($route['route_name']);
     $route['title'] = $title;
     return $route;
   }
diff --git a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6Node.php b/core/modules/migrate_drupal/src/Tests/Dump/Drupal6Node.php
index 5d393d6..55be0d4 100644
--- a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6Node.php
+++ b/core/modules/migrate_drupal/src/Tests/Dump/Drupal6Node.php
@@ -557,7 +557,7 @@ public function load() {
         'field_test_identical2_value' => 1,
         'field_test_link_url' => 'http://drupal.org/project/drupal',
         'field_test_link_title' => 'Drupal project page',
-        'field_test_link_attributes' => 's:6:"a:0:{}";',
+        'field_test_link_attributes' => 's:32:"a:1:{s:6:"target";s:6:"_blank";}";";',
       ))
       ->values(array(
         'nid' => 1,
@@ -569,7 +569,7 @@ public function load() {
         'field_test_identical2_value' => 1,
         'field_test_link_url' => 'http://drupal.org/project/drupal',
         'field_test_link_title' => 'Drupal project page',
-        'field_test_link_attributes' => 's:6:"a:0:{}";',
+        'field_test_link_attributes' => 's:32:"a:1:{s:6:"target";s:6:"_blank";}";',
       ))
       ->values(array(
         'nid' => 2,
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php
index e7708b5..7920277 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php
@@ -158,7 +158,8 @@ public function testCckFields() {
     $this->assertIdentical($node->field_test_link->url, 'http://drupal.org/project/drupal');
     $this->assertIdentical($node->field_test_link->title, 'Drupal project page');
     $this->assertIdentical($node->field_test_link->route_parameters, []);
-    $this->assertIdentical($node->field_test_link->options, []);
+    $this->assertIdentical($node->field_test_link->options['attributes'], ['target' => '_blank']);
+    $this->assertIdentical($node->field_test_link->options['external'], TRUE);
 
     $planet_node = Node::load(3);
     $this->assertEqual($planet_node->field_multivalue->value, 33);