diff --git a/bin/heat-manage b/bin/heat-manage
index e47bdbb728..3a7f42f576 100755
--- a/bin/heat-manage
+++ b/bin/heat-manage
@@ -13,6 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import warnings
+warnings.warn("DEPRECATED: This script is deprecated. Please use the "
+              "system level heat-manage binary", DeprecationWarning)
+
 import os
 import sys
 
diff --git a/setup.cfg b/setup.cfg
index 2275d2a194..153b3ef3b7 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -28,9 +28,11 @@ scripts =
     bin/heat-engine
     bin/heat-keystone-setup
     bin/heat-keystone-setup-domain
-    bin/heat-manage
 
 [entry_points]
+console_scripts =
+    heat-manage = heat.cmd.manage:main
+
 oslo.config.opts =
     heat.common.config = heat.common.config:list_opts
     heat.common.crypt = heat.common.crypt:list_opts