diff --git a/trytond/config.py b/trytond/config.py
index 7d27886c61..06ea8207ff 100644
--- a/trytond/config.py
+++ b/trytond/config.py
@@ -65,13 +65,6 @@ class ConfigManager(object):
                 default=True, help="disable netrpc")
         parser.add_option("--xmlrpc", dest="xmlrpc", action="store_true",
                 default=False, help="enable xmlrpc")
-        parser.add_option("-i", "--init", dest="init",
-                help="init a module (use \"all\" for all modules)")
-        parser.add_option("--without-demo", dest="without_demo",
-                help="load demo data for a module " \
-                        "(use \"all\" for all modules)", default=False)
-        parser.add_option("-u", "--update", dest="update",
-                help="update a module (use \"all\" for all modules)")
         parser.add_option("--stop-after-init", action="store_true",
                 dest="stop_after_init", default=False,
                 help="stop the server after it initializes")
@@ -92,6 +85,15 @@ class ConfigManager(object):
                 default='2', help='specify the price accuracy')
 
         group = optparse.OptionGroup(parser, "Modules related options")
+        group.add_option("-i", "--init", dest="init",
+                help="init a module (use \"all\" for all modules)")
+        group.add_option("--without-demo", dest="without_demo",
+                help="load demo data for a module " \
+                        "(use \"all\" for all modules)", default=False)
+        group.add_option("-u", "--update", dest="update",
+                help="update a module (use \"all\" for all modules)")
+
+        parser.add_option_group(group)
         group = optparse.OptionGroup(parser, "Database related options")
         group.add_option("-d", "--database", dest="db_name",
                 help="specify the database name")