diff --git a/man/gnt-cluster.sgml b/man/gnt-cluster.sgml
index 6b0cc71b7ae3509cf2822d0aca1234a29f89c6a8..ef9e58f1f83d4e21081b774888c86429ef851fbd 100644
--- a/man/gnt-cluster.sgml
+++ b/man/gnt-cluster.sgml
@@ -55,6 +55,21 @@
   <refsect1>
     <title>COMMANDS</title>
 
+    <refsect2>
+      <title>ADD-TAGS</title>
+
+      <cmdsynopsis>
+        <command>add-tags</command>
+        <arg choice="req"
+        rep="repeat"><replaceable>tag</replaceable></arg>
+      </cmdsynopsis>
+
+      <para>
+        Add tags to the cluster. If any of the tags contains invalid
+        characters, the entire operation will abort.
+      </para>
+    </refsect2>
+
     <refsect2>
       <title>COMMAND</title>
 
@@ -208,6 +223,16 @@
       </para>
     </refsect2>
 
+    <refsect2>
+      <title>LIST-TAGS</title>
+
+      <cmdsynopsis>
+        <command>list-tags</command>
+      </cmdsynopsis>
+
+      <para>List the tags of the cluster.</para>
+    </refsect2>
+
     <refsect2>
       <title>MASTERFAILOVER</title>
 
@@ -220,6 +245,21 @@
       </para>
     </refsect2>
 
+    <refsect2>
+      <title>REMOVE-TAGS</title>
+
+      <cmdsynopsis>
+        <command>remove-tags</command>
+        <arg choice="req"
+        rep="repeat"><replaceable>tag</replaceable></arg>
+      </cmdsynopsis>
+
+      <para>
+        Remove tags from the cluster. If any of the tags are not
+        existing on the cluster, the entire operation will abort.
+      </para>
+    </refsect2>
+
     <refsect2>
       <title>RENAME</title>
 
diff --git a/man/gnt-instance.sgml b/man/gnt-instance.sgml
index fd4cf57cec4459fea4d60bd0b26c00e6f81274ad..53885e70b0fdf3e44020375c89435bd23913f9ee 100644
--- a/man/gnt-instance.sgml
+++ b/man/gnt-instance.sgml
@@ -750,6 +750,53 @@ node1.example.com:sdb:/dev/md1
 
     </refsect2>
 
+    <refsect2>
+      <title>TAGS</title>
+
+    <refsect3>
+        <title>ADD-TAGS</title>
+
+        <cmdsynopsis>
+          <command>add-tags</command>
+          <arg choice="req"><replaceable>instancename</replaceable></arg>
+          <arg choice="req"
+            rep="repeat"><replaceable>tag</replaceable></arg>
+        </cmdsynopsis>
+
+        <para>
+          Add tags to the given instance. If any of the tags contains
+          invalid characters, the entire operation will abort.
+        </para>
+      </refsect3>
+
+      <refsect3>
+        <title>LIST-TAGS</title>
+
+        <cmdsynopsis>
+          <command>list-tags</command>
+          <arg choice="req"><replaceable>instancename</replaceable></arg>
+        </cmdsynopsis>
+
+        <para>List the tags of the given instance.</para>
+      </refsect3>
+
+      <refsect3>
+        <title>REMOVE-TAGS</title>
+        <cmdsynopsis>
+          <command>remove-tags</command>
+          <arg choice="req"><replaceable>instancename</replaceable></arg>
+          <arg choice="req"
+            rep="repeat"><replaceable>tag</replaceable></arg>
+        </cmdsynopsis>
+
+        <para>
+          Remove tags from the given instance. If any of the tags are
+          not existing on the node, the entire operation will abort.
+        </para>
+      </refsect3>
+
+    </refsect2>
+
   </refsect1>
 
   &footer;
diff --git a/man/gnt-node.sgml b/man/gnt-node.sgml
index 7341f133856926392df68fb9227ccaa9d288326e..1b71e59a1acf77a727f9d227bbd66106a440eb68 100644
--- a/man/gnt-node.sgml
+++ b/man/gnt-node.sgml
@@ -100,6 +100,22 @@
       </para>
     </refsect2>
 
+    <refsect2>
+      <title>ADD-TAGS</title>
+
+      <cmdsynopsis>
+        <command>add-tags</command>
+        <arg choice="req"><replaceable>nodename</replaceable></arg>
+        <arg choice="req"
+        rep="repeat"><replaceable>tag</replaceable></arg>
+      </cmdsynopsis>
+
+      <para>
+        Add tags to the given node. If any of the tags contains
+        invalid characters, the entire operation will abort.
+      </para>
+    </refsect2>
+
     <refsect2>
       <title>INFO</title>
 
@@ -240,6 +256,17 @@
       </para>
     </refsect2>
 
+    <refsect2>
+      <title>LIST-TAGS</title>
+
+      <cmdsynopsis>
+        <command>list-tags</command>
+        <arg choice="req"><replaceable>nodename</replaceable></arg>
+      </cmdsynopsis>
+
+      <para>List the tags of the given node.</para>
+    </refsect2>
+
     <refsect2>
       <title>REMOVE</title>
 
@@ -261,6 +288,21 @@
       </para>
     </refsect2>
 
+    <refsect2>
+      <title>REMOVE-TAGS</title>
+      <cmdsynopsis>
+        <command>remove-tags</command>
+        <arg choice="req"><replaceable>nodename</replaceable></arg>
+        <arg choice="req"
+        rep="repeat"><replaceable>tag</replaceable></arg>
+      </cmdsynopsis>
+
+      <para>
+        Remove tags from the given node. If any of the tags are not
+        existing on the node, the entire operation will abort.
+      </para>
+    </refsect2>
+
     <refsect2>
       <title>VOLUMES</title>