diff --git a/scm-core/src/main/java/sonia/scm/plugin/PluginInformation.java b/scm-core/src/main/java/sonia/scm/plugin/PluginInformation.java
index 0ce0bbfcd8..2d0507b2df 100644
--- a/scm-core/src/main/java/sonia/scm/plugin/PluginInformation.java
+++ b/scm-core/src/main/java/sonia/scm/plugin/PluginInformation.java
@@ -83,6 +83,7 @@ public class PluginInformation implements Validateable, Cloneable, Serializable
     clone.setArtifactId(artifactId);
     clone.setAuthor(author);
     clone.setCategory(category);
+    clone.setTags(tags);
 
     if (condition != null)
     {
@@ -133,6 +134,7 @@ public class PluginInformation implements Validateable, Cloneable, Serializable
     return Objects.equal(artifactId, other.artifactId)
       && Objects.equal(author, other.author)
       && Objects.equal(category, other.category)
+      && Objects.equal(tags, other.tags)
       && Objects.equal(condition, other.condition)
       && Objects.equal(description, other.description)
       && Objects.equal(groupId, other.groupId)
@@ -154,7 +156,7 @@ public class PluginInformation implements Validateable, Cloneable, Serializable
   @Override
   public int hashCode()
   {
-    return Objects.hashCode(artifactId, author, category, condition,
+    return Objects.hashCode(artifactId, author, category, tags, condition,
       description, groupId, name, screenshots, state, url, version, wiki);
   }
 
@@ -172,6 +174,7 @@ public class PluginInformation implements Validateable, Cloneable, Serializable
                   .add("artifactId", artifactId)
                   .add("author", author)
                   .add("category", category)
+                  .add("tags", tags)
                   .add("condition", condition)
                   .add("description", description)
                   .add("groupId", groupId)
@@ -320,6 +323,17 @@ public class PluginInformation implements Validateable, Cloneable, Serializable
     return state;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public List<String> getTags()
+  {
+    return tags;
+  }
+
   /**
    * Method description
    *
@@ -467,6 +481,17 @@ public class PluginInformation implements Validateable, Cloneable, Serializable
     this.state = state;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param tags
+   */
+  public void setTags(List<String> tags)
+  {
+    this.tags = tags;
+  }
+
   /**
    * Method description
    *
@@ -531,6 +556,11 @@ public class PluginInformation implements Validateable, Cloneable, Serializable
   /** Field description */
   private PluginState state;
 
+  /** Field description */
+  @XmlElement(name = "tag")
+  @XmlElementWrapper(name = "tags")
+  private List<String> tags;
+
   /** Field description */
   private String url;
 
diff --git a/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/plugin.xml b/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/plugin.xml
index a0bc2ea963..1132395c09 100644
--- a/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/plugin.xml
+++ b/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/plugin.xml
@@ -47,6 +47,11 @@
   <information>
     <author>Sebastian Sdorra</author>
     <category>Git</category>
+    <tags>
+      <tag>git</tag>
+      <tag>scm</tag>
+      <tag>dvcs</tag>
+    </tags>
   </information>
 
   <conditions>
diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/plugin.xml b/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/plugin.xml
index 4137d8dfb5..6e5e01f95f 100644
--- a/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/plugin.xml
+++ b/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/plugin.xml
@@ -47,6 +47,12 @@
   <information>
     <author>Sebastian Sdorra</author>
     <category>Mercurial</category>
+    <tags>
+      <tag>mercurial</tag>
+      <tag>hg</tag>
+      <tag>scm</tag>
+      <tag>dvcs</tag>
+    </tags>
   </information>
 
   <conditions>
diff --git a/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/plugin.xml b/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/plugin.xml
index 8d58d2d7ab..9fe105e5bd 100644
--- a/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/plugin.xml
+++ b/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/plugin.xml
@@ -47,6 +47,11 @@
   <information>
     <author>Sebastian Sdorra</author>
     <category>Subversion</category>
+    <tags>
+      <tag>subversion</tag>
+      <tag>scm</tag>
+      <tag>svn</tag>
+    </tags>
   </information>
 
   <conditions>