diff --git a/setup.cfg b/setup.cfg
index 17445170..d11fa7ae 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,11 +26,8 @@ packages =
 console_scripts =
     heat = heatclient.shell:main
 
-# NOTE(skraynev): This extension is commented for release 0.9.0 and
-# will be enabled in future release, when full support for openstackclient
-# be implemented.
-#openstack.cli.extension =
-#    orchestration = heatclient.osc.plugin
+openstack.cli.extension =
+    orchestration = heatclient.osc.plugin
 
 openstack.orchestration.v1 =
     stack_show = heatclient.osc.v1.stack:ShowStack