diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index 6749310..671c961 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -89,25 +89,6 @@ function aggregator_theme() {
 }
 
 /**
- * Implements hook_entity_info().
- */
-function aggregator_entity_info() {
-  $items['aggregator_item'] = array(
-    'label' => t('Aggregator feed item'),
-    'entity class' => 'Drupal\aggregator\Item',
-    'controller class' => 'Drupal\aggregator\ItemStorageController',
-    'render controller class' => 'Drupal\aggregator\ItemRenderController',
-    'base table' => 'aggregator_item',
-    'fieldable' => TRUE,
-    'entity keys' => array(
-      'id' => 'iid',
-      'label' => 'title',
-    ),
-  );
-  return $items;
-}
-
-/**
  * Implements hook_menu().
  */
 function aggregator_menu() {
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Item.php b/core/modules/aggregator/lib/Drupal/aggregator/Item.php
deleted file mode 100644
index a6ca1ce..0000000
--- a/core/modules/aggregator/lib/Drupal/aggregator/Item.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\aggregator\Item.
- */
-
-namespace Drupal\aggregator;
-
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\EntityNG;
-
-/**
- * Defines the aggregator item entity class.
- */
-class Item extends EntityNG implements ContentEntityInterface {
-
-  /**
-   * The feed item ID.
-   *
-   * @todo rename to id.
-   *
-   * @var \Drupal\Core\Entity\Field\FieldInterface
-   */
-  public $iid;
-
-  /**
-   * The feed ID.
-   *
-   * @todo rename to feed_id.
-   *
-   * @var \Drupal\Core\Entity\Field\FieldInterface
-   */
-  public $fid;
-
-  /**
-   * Title of the feed item.
-   *
-   * @var \Drupal\Core\Entity\Field\FieldInterface
-   */
-  public $title;
-
-  /**
-   * Link to the feed item.
-   *
-   * @var \Drupal\Core\Entity\Field\FieldInterface
-   */
-  public $link;
-
-  /**
-   * Author of the feed item.
-   *
-   * @var \Drupal\Core\Entity\Field\FieldInterface
-   */
-  public $author;
-
-  /**
-   * Body of the feed item.
-   *
-   * @var \Drupal\Core\Entity\Field\FieldInterface
-   */
-  public $description;
-
-  /**
-   * Posted date of the feed item, as a Unix timestamp.
-   *
-   * @var \Drupal\Core\Entity\Field\FieldInterface
-   */
-  public $timestamp;
-
-  /**
-   * Unique identifier for the feed item.
-   *
-   * @var \Drupal\Core\Entity\Field\FieldInterface
-   */
-  public $guid;
-
-  /**
-   * Implements Drupal\Core\Entity\EntityInterface::__construct().
-   */
-  public function __construct(array $values, $entity_type) {
-    parent::__construct($values, $entity_type);
-
-    // We unset all defined properties, so magic getters apply.
-    unset($this->iid);
-    unset($this->fid);
-    unset($this->title);
-    unset($this->author);
-    unset($this->description);
-    unset($this->guid);
-    unset($this->link);
-    unset($this->timestamp);
-  }
-
-  /**
-   * Implements Drupal\Core\Entity\EntityInterface::id().
-   */
-  public function id() {
-    return $this->get('iid')->value;
-  }
-
-  /**
-   * Implements Drupal\Core\Entity\EntityInterface::label().
-   */
-  public function label($langcode = NULL) {
-    return $this->title->value;
-  }
-}
-
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/ItemRenderController.php b/core/modules/aggregator/lib/Drupal/aggregator/ItemRenderController.php
index 298c285..160bb72 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/ItemRenderController.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/ItemRenderController.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\aggregator\ItemRenderController.
+ * Cotains Drupal\aggregator\ItemRenderController.
  */
 
 namespace Drupal\aggregator;
@@ -11,7 +11,7 @@
 use Drupal\Core\Entity\EntityRenderController;
 
 /**
- * Render controller for aggregators.
+ * Render controller for aggregator feed items.
  */
 class ItemRenderController extends EntityRenderController {
 
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php b/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php
index e1b07eb..6c70fd6 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/ItemStorageController.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\aggregator\ItemStorageController.
+ * Contains Drupal\aggregator\ItemStorageController.
  */
 
 namespace Drupal\aggregator;
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Core/Entity/Item.php b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Core/Entity/Item.php
new file mode 100644
index 0000000..0ec136b
--- /dev/null
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Core/Entity/Item.php
@@ -0,0 +1,125 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\aggregator\Plugin\Core\Entity\Item.
+ */
+
+namespace Drupal\aggregator\Plugin\Core\Entity;
+
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\EntityNG;
+use Drupal\Core\Annotation\Plugin;
+use Drupal\Core\Annotation\Translation;
+
+/**
+ * Defines the aggregator item entity class.
+ *
+ * @Plugin(
+ *   id = "aggregator_item",
+ *   label = @Translation("Aggregator feed item"),
+ *   module = "aggregator",
+ *   controller_class = "Drupal\aggregator\ItemStorageController",
+ *   render_controller_class = "Drupal\aggregator\ItemRenderController",
+ *   base_table = "aggregator_item",
+ *   fieldable = TRUE,
+ *   entity_keys = {
+ *     "id" = "iid",
+ *     "label" = "title",
+ *   }
+ * )
+ */
+class Item extends EntityNG implements ContentEntityInterface {
+
+  /**
+   * The feed item ID.
+   *
+   * @todo rename to id.
+   *
+   * @var \Drupal\Core\Entity\Field\FieldInterface
+   */
+  public $iid;
+
+  /**
+   * The feed ID.
+   *
+   * @todo rename to feed_id.
+   *
+   * @var \Drupal\Core\Entity\Field\FieldInterface
+   */
+  public $fid;
+
+  /**
+   * Title of the feed item.
+   *
+   * @var \Drupal\Core\Entity\Field\FieldInterface
+   */
+  public $title;
+
+  /**
+   * Link to the feed item.
+   *
+   * @var \Drupal\Core\Entity\Field\FieldInterface
+   */
+  public $link;
+
+  /**
+   * Author of the feed item.
+   *
+   * @var \Drupal\Core\Entity\Field\FieldInterface
+   */
+  public $author;
+
+  /**
+   * Body of the feed item.
+   *
+   * @var \Drupal\Core\Entity\Field\FieldInterface
+   */
+  public $description;
+
+  /**
+   * Posted date of the feed item, as a Unix timestamp.
+   *
+   * @var \Drupal\Core\Entity\Field\FieldInterface
+   */
+  public $timestamp;
+
+  /**
+   * Unique identifier for the feed item.
+   *
+   * @var \Drupal\Core\Entity\Field\FieldInterface
+   */
+  public $guid;
+
+  /**
+   * Implements Drupal\Core\Entity\EntityInterface::__construct().
+   */
+  public function __construct(array $values, $entity_type) {
+    parent::__construct($values, $entity_type);
+
+    // We unset all defined properties, so magic getters apply.
+    unset($this->iid);
+    unset($this->fid);
+    unset($this->title);
+    unset($this->author);
+    unset($this->description);
+    unset($this->guid);
+    unset($this->link);
+    unset($this->timestamp);
+  }
+
+  /**
+   * Implements Drupal\Core\Entity\EntityInterface::id().
+   */
+  public function id() {
+    return $this->get('iid')->value;
+  }
+
+  /**
+   * Implements Drupal\Core\Entity\EntityInterface::label().
+   */
+  public function label($langcode = NULL) {
+    return $this->get('title')->value;
+  }
+}
+