diff --git a/manual/cli.rst b/manual/cli.rst
index 06fbc7c6..7e20d008 100644
--- a/manual/cli.rst
+++ b/manual/cli.rst
@@ -26,8 +26,6 @@ General options
 +------------+----------------------+-------------------------------------------------------------------------------------------------------------------------------+
 | -y N       | --height=N           | HEIGHT of the world to be generated                                                                                           |
 +------------+----------------------+-------------------------------------------------------------------------------------------------------------------------------+
-| -q N       | --number-of-plates=N | number of plates                                                                                                              |
-+------------+----------------------+-------------------------------------------------------------------------------------------------------------------------------+
 |            | --recursion-limit=N  | you need that just if you encounter an error while generating very large maps                                                 |
 +------------+----------------------+-------------------------------------------------------------------------------------------------------------------------------+
 | -v         | --verbose            | Enable verbose messages                                                                                                       |
@@ -44,6 +42,8 @@ Options valid only for generate
 +-----------+----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------+
 | Short     | Long                       | Description                                                                                                                                    |
 +===========+============================+================================================================================================================================================+
+| -q N      | --number-of-plates=N       | number of plates                                                                                                                               |
++-----------+----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------+
 | -r FILE   | --rivers=FILE              | Produce a map of rivers, after the option it expects the name of the file where to generate the map                                            |
 +-----------+----------------------------+------------------------------------------------------------------------------------------------------------------------------------------------+
 | --gs      | --grayscale-heightmap      | Produce a grayscale heightmap                                                                                                                  |
diff --git a/worldengine/cli/main.py b/worldengine/cli/main.py
index 93ec93ef..44fb354b 100644
--- a/worldengine/cli/main.py
+++ b/worldengine/cli/main.py
@@ -273,10 +273,6 @@ def main():
                              "[default=%(default)s]",
                         metavar="N",
                         default='512')
-    parser.add_argument('-q', '--number-of-plates', dest='number_of_plates',
-                        type=int,
-                        help="N = number of plates [default = %(default)s]",
-                        metavar="N", default='10')
     parser.add_argument('--recursion_limit', dest='recursion_limit', type=int,
                         help="Set the recursion limit [default = %(default)s]",
                         metavar="N", default='2000')
@@ -293,6 +289,10 @@ def main():
     g_generate = parser.add_argument_group(
         "Generate Options", "These options are only useful in plate and " +
         "world modes")
+    g_generate.add_argument('-q', '--number-of-plates', dest='number_of_plates',
+                            type=int,
+                            help="N = number of plates [default = %(default)s]",
+                            metavar="N", default='10')
     g_generate.add_argument('-r', '--rivers', dest='rivers_map',
                             action="store_true", help="generate rivers map")
     g_generate.add_argument('--gs', '--grayscale-heightmap',