diff --git a/rally/cmd/manage.py b/rally/cmd/manage.py
index 81819228f8..3337f37571 100644
--- a/rally/cmd/manage.py
+++ b/rally/cmd/manage.py
@@ -31,6 +31,12 @@ class DBCommands(object):
         db.db_create()
 
 
+def deprecated():
+    print("\n\n---\n\nopenstack-rally and openstack-rally-manage are "
+          "deprecated, please use rally and rally-manage\n\n---\n\n")
+    main()
+
+
 def main():
     categories = {'db': DBCommands}
     cliutils.run(sys.argv, categories)
diff --git a/setup.cfg b/setup.cfg
index 421f2120cf..4f9b93524c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,7 +26,7 @@ console_scripts =
     rally = rally.cmd.main:main
     rally-manage = rally.cmd.manage:main
     openstack-rally = rally.cmd.main:deprecated
-    openstack-rally-manage = rally.cmd.main:deprecated
+    openstack-rally-manage = rally.cmd.manage:deprecated
 
 
 [global]