diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3ad24529f6..21a46ff9314 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v1.1.1
+- Adds a brief description of each template inline when running `firebase bootstrap`
+
 ## v1.1.0
 - Supports new advanced features parameters in the `firebase.json` to allow greater customization of hosting parameters
 - improves default "ignore" rules to specify any dot file, regardless of whether in a sub-directory
diff --git a/lib/app.js b/lib/app.js
index ad03b3975b5..33bb7226ed0 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -328,7 +328,27 @@ module.exports = {
             console.log(chalk.yellow('----------------------------------------------------'));
             console.log(chalk.yellow('Available Templates'));
             console.log(chalk.yellow('----------------------------------------------------'));
-            console.log(templateList.join('\n'));
+
+            var longestTemplateLength = 0;
+            for (var i = 0; i < templateList.length; i++) {
+              if (templateList[i].length > longestTemplateLength) {
+                longestTemplateLength = templateList[i].length;
+              }
+            }
+            for (var i = 0; i < templateList.length; i++) {
+              var key = templateList[i],
+                  template = supportedTemplates[key];
+              var output = chalk.bold(key);
+              if (template.description) {
+                var spacingString = '';
+                for (var j = longestTemplateLength; j > key.length; j--) {
+                  spacingString += ' ';
+                }
+                output += spacingString + ' - ' + template.description;
+              }
+              console.log(output);
+            }
+
             console.log(chalk.yellow('----------------------------------------------------'));
             console.log('Choose a template to help you get started with your app');
           }
diff --git a/package.json b/package.json
index a94435c58e3..22a75510f19 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "firebase-tools",
   "preferGlobal": true,
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "The Firebase Command Line Tools",
   "keywords": [
     "firebase",