diff --git a/config/schema/metatag.metatag_tag.schema.yml b/config/schema/metatag.metatag_tag.schema.yml
index c64c2e4..d2b9d0d 100644
--- a/config/schema/metatag.metatag_tag.schema.yml
+++ b/config/schema/metatag.metatag_tag.schema.yml
@@ -1,9 +1,6 @@
 metatag.metatag_tag.abstract:
   type: label
   label: 'Abstract'
-metatag.metatag_tag.author:
-  type: label
-  label: 'Author'
 metatag.metatag_tag.canonical_url:
   type: label
   label: 'Canonical URL'
diff --git a/metatag_google_plus/config/schema/metatag_google_plus.metatag_tag.schema.yml b/metatag_google_plus/config/schema/metatag_google_plus.metatag_tag.schema.yml
index e4f7603..c56295b 100644
--- a/metatag_google_plus/config/schema/metatag_google_plus.metatag_tag.schema.yml
+++ b/metatag_google_plus/config/schema/metatag_google_plus.metatag_tag.schema.yml
@@ -10,3 +10,6 @@ metatag.metatag_tag.google_plus_description:
 metatag.metatag_tag.google_plus_publisher:
   type: label
   label: 'Publisher URL'
+metatag.metatag_tag.google_plus_author:
+  type: label
+  label: 'Author'
diff --git a/src/Plugin/metatag/Tag/Author.php b/metatag_google_plus/src/Plugin/metatag/Tag/Author.php
similarity index 76%
rename from src/Plugin/metatag/Tag/Author.php
rename to metatag_google_plus/src/Plugin/metatag/Tag/Author.php
index bf83a79..d8a98ee 100644
--- a/src/Plugin/metatag/Tag/Author.php
+++ b/metatag_google_plus/src/Plugin/metatag/Tag/Author.php
@@ -1,16 +1,18 @@
 <?php
 
-namespace Drupal\metatag\Plugin\metatag\Tag;
+namespace Drupal\metatag_google_plus\Plugin\metatag\Tag;
+
+use \Drupal\metatag\Plugin\metatag\Tag\LinkRelBase;
 
 /**
  * The basic "Author" meta tag.
  *
  * @MetatagTag(
- *   id = "author",
+ *   id = "google_plus_author",
  *   label = @Translation("Author"),
  *   description = @Translation("Used by some search engines to confirm authorship of the content on a page. Should be either the full URL for the author's Google+ profile page or a local page with information about the author."),
  *   name = "author",
- *   group = "advanced",
+ *   group = "google_plus",
  *   weight = 4,
  *   type = "label",
  *   secure = FALSE,
diff --git a/metatag_google_plus/src/Plugin/metatag/Tag/Publisher.php b/metatag_google_plus/src/Plugin/metatag/Tag/Publisher.php
index 1e36e07..048eeba 100644
--- a/metatag_google_plus/src/Plugin/metatag/Tag/Publisher.php
+++ b/metatag_google_plus/src/Plugin/metatag/Tag/Publisher.php
@@ -13,7 +13,7 @@
  *   description = @Translation("Used by some search engines to confirm publication of the content on a page. Should be the full URL for the publication's Google+ profile page."),
  *   name = "publisher",
  *   group = "google_plus",
- *   weight = 4,
+ *   weight = 5,
  *   type = "label",
  *   secure = FALSE,
  *   multiple = FALSE
diff --git a/metatag_google_plus/src/Tests/MetatagGooglePlusTagsTest.php b/metatag_google_plus/src/Tests/MetatagGooglePlusTagsTest.php
index 36a33ad..9fe6dda 100644
--- a/metatag_google_plus/src/Tests/MetatagGooglePlusTagsTest.php
+++ b/metatag_google_plus/src/Tests/MetatagGooglePlusTagsTest.php
@@ -16,6 +16,7 @@ class MetatagGooglePlusTagsTest extends MetatagTagsTestBase {
    * {@inheritdoc}
    */
   public $tags = [
+    'google_plus_author',
     'google_plus_description',
     'google_plus_image',
     'google_plus_name',
@@ -47,6 +48,20 @@ public function get_test_tag_name($tag_name) {
   }
 
   /**
+   * Implements {meta_tag_name}_test_name_attribute() for 'author'.
+   */
+  public function google_plus_author_test_output_xpath() {
+    return "//link[@rel='author']";
+  }
+
+  /**
+   * Implements {meta_tag_name}_test_value_attribute() for 'author'.
+   */
+  public function google_plus_author_test_value_attribute() {
+    return 'href';
+  }
+
+  /**
    * Implements {meta_tag_name}_test_name_attribute() for 'publisher'.
    */
   public function google_plus_publisher_test_output_xpath() {