diff --git a/doc/source/man/nova-manage.rst b/doc/source/man/nova-manage.rst
index 4058d4019e8f..c3610a698f42 100644
--- a/doc/source/man/nova-manage.rst
+++ b/doc/source/man/nova-manage.rst
@@ -118,6 +118,9 @@ Nova Floating IPs
 Nova Flavor
 ~~~~~~~~~~~
 
+**DEPRECATED** Use the nova flavor-* commands from python-novaclient instead.
+The flavor subcommand will be removed in the 2015.1 release.
+
 ``nova-manage flavor list``
 
     Outputs a list of all active flavors to the screen.
diff --git a/nova/cmd/manage.py b/nova/cmd/manage.py
index fc89e5920b35..3f6baa2f71f3 100644
--- a/nova/cmd/manage.py
+++ b/nova/cmd/manage.py
@@ -927,6 +927,10 @@ class FlavorCommands(object):
     Note instance type is a deprecated synonym for flavor.
     """
 
+    description = ('DEPRECATED: Use the nova flavor-* commands from '
+                   'python-novaclient instead. The flavor subcommand will be '
+                   'removed in the 2015.1 release')
+
     def _print_flavors(self, val):
         is_public = ('private', 'public')[val["is_public"] == 1]
         print(("%s: Memory: %sMB, VCPUS: %s, Root: %sGB, Ephemeral: %sGb, "
@@ -1300,13 +1304,14 @@ def add_command_parsers(subparsers):
     for category in CATEGORIES:
         command_object = CATEGORIES[category]()
 
-        parser = subparsers.add_parser(category)
+        desc = getattr(command_object, 'description', None)
+        parser = subparsers.add_parser(category, description=desc)
         parser.set_defaults(command_object=command_object)
 
         category_subparsers = parser.add_subparsers(dest='action')
 
         for (action, action_fn) in methods_of(command_object):
-            parser = category_subparsers.add_parser(action)
+            parser = category_subparsers.add_parser(action, description=desc)
 
             action_kwargs = []
             for args, kwargs in getattr(action_fn, 'args', []):