diff --git a/README.md b/README.md
index ef9960343061a07651618b873ef7de20561d662d..63f60d842e39456e3a918af3430cd380dd376d50 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,6 @@ export class TodoListApp extends App {
 
 Currently the Rocket.Chat servers and Marketplace allow submission of zip files, these files can be created by running `rc-apps package` which packages your app and creates the zip file under `dist` folder.
 
-
 ### Uploading the app 
 For uploading the app you need add to the required parameters in the .rcappsconfig already created in the apps directory. It accepts two types of objects:-
 
@@ -91,3 +90,7 @@ For uploading the app you need add to the required parameters in the .rcappsconf
     token: string;
 }
 ```
+
+### Enabling autocomplete for commands
+
+To enable autocomplete for the apps cli use the command `rc-apps autocomplete <your-shell-type>` with the shell type as zsh or bash as the supported types. This would provide a step by step instruction to enable shell completion in your preferred shell. 
diff --git a/package.json b/package.json
index aa5b54978c207ce32beed976faa091508f5d7d20..3ce1492c3edff5746ec6deeb412c8d2a09a4c212 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "@hapi/hapi": "^18.4.0",
     "@oclif/command": "^1.5.18",
     "@oclif/config": "^1.13.2",
+    "@oclif/plugin-autocomplete": "^0.2.0",
     "@oclif/plugin-help": "^2.2.0",
     "@oclif/plugin-not-found": "^1.2.2",
     "@rocket.chat/apps-engine": "^1.12.0",
@@ -89,7 +90,8 @@
     "bin": "rc-apps",
     "plugins": [
       "@oclif/plugin-help",
-      "@oclif/plugin-not-found"
+      "@oclif/plugin-not-found",
+      "@oclif/plugin-autocomplete"
     ]
   },
   "nyc": {