diff --git a/lib/session.js b/lib/session.js
index e949d33d..2388c8cf 100755
--- a/lib/session.js
+++ b/lib/session.js
@@ -264,6 +264,7 @@ session.getAutocomplete = function (str, cb) {
 
   // Complete command
   var names = _.pluck(this.parent.commands, '_name');
+  names = names.concat.apply(names, _.pluck(this.parent.commands, '_aliases'));
   var result = this._autocomplete(trimmed, names);
   if (result && trimmed.length < String(result).trim().length) {
     cb(undefined, pre + result + remainder);