diff --git a/lib/cli.py b/lib/cli.py
index 32e1a0fb4690a681f6a200afa012e028c836aa3a..eceebe09868065f5bdc01824b34f6f15d80f9d05 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -902,7 +902,7 @@ CP_SIZE_OPT = cli_option("-C", "--candidate-pool-size", default=None,
                          dest="candidate_pool_size", type="int",
                          help="Set the candidate pool size")
 
-VG_NAME_OPT = cli_option("-g", "--vg-name", dest="vg_name",
+VG_NAME_OPT = cli_option("--vg-name", dest="vg_name",
                          help="Enables LVM and specifies the volume group"
                          " name (cluster-wide) for disk allocation [xenvg]",
                          metavar="VG", default=None)
diff --git a/man/gnt-cluster.sgml b/man/gnt-cluster.sgml
index c1a8bb1a35120befbf1f1ec50a1d383ee705daea..53e9483735e8d28d920b186f5fa738a4b242ac15 100644
--- a/man/gnt-cluster.sgml
+++ b/man/gnt-cluster.sgml
@@ -226,7 +226,7 @@
         <sbr>
         <arg>-s <replaceable>secondary_ip</replaceable></arg>
         <sbr>
-        <arg>-g <replaceable>vg-name</replaceable></arg>
+        <arg>--vg-name <replaceable>vg-name</replaceable></arg>
         <sbr>
         <arg>--master-netdev <replaceable>interface-name</replaceable></arg>
         <sbr>
@@ -298,7 +298,7 @@
       </para>
 
       <para>
-        The <option>-g</option> option will let you specify a volume group
+        The <option>--vg-name</option> option will let you specify a volume group
         different than "xenvg" for Ganeti to use when creating instance disks.
         This volume group must have the same name on all nodes. Once the
         cluster is initialized this can be altered by using the
@@ -635,7 +635,7 @@
       <cmdsynopsis>
         <command>modify</command>
         <sbr>
-        <arg choice="opt">-g <replaceable>vg-name</replaceable></arg>
+        <arg choice="opt">--vg-name <replaceable>vg-name</replaceable></arg>
         <sbr>
         <arg choice="opt">--no-lvm-storage</arg>
         <sbr>
@@ -672,7 +672,7 @@
         </para>
 
         <para>
-          The <option>-g</option>, <option>--no-lvm-storarge</option>,
+          The <option>--vg-name</option>, <option>--no-lvm-storarge</option>,
           <option>--enabled-hypervisors</option>,
           <option>--hypervisor-parameters</option>,
           <option>--backend-parameters</option>,