diff --git a/commands/update.bee.inc b/commands/update.bee.inc
index 58ca49b..f6725fc 100644
--- a/commands/update.bee.inc
+++ b/commands/update.bee.inc
@@ -19,6 +19,54 @@ function update_bee_command() {
         'bee update-db' => bt('Show a list of any pending database updates. You will then be prompted to apply them.'),
       ),
     ),
+    'update' => array(
+      'description' => bt('Updates backdrop, modules, themes and layouts with new releases'),
+      'callback' => 'update_bee_callback',
+      'aliases' => array('up', 'pm-update'),
+      'bootstrap' => BEE_BOOTSTRAP_FULL,
+      'arguments' => array(
+        'projects' => bt('One or more projects to update.'),
+      ),
+      'optional_arguments' => array('projects'),
+      'multiple_argument' => 'projects',
+      'options' => array(
+        'security-only' => array(
+          'description' => bt('Only update modules that have security updates available.'),
+          'short' => 's',
+        ),
+      ),
+      'examples' => array(
+        'bee update' => bt('Update everything with a new release.'),
+        'bee update --security-only' => bt('Update everything that is a security update only'),
+        'bee update webform tatsu' => bt('Updates the Webform module and Tatsu theme only'),
+      ),
+    ),
+    'update-list' => array(
+      'description' => bt('Lists available updates for backdrop, modules, themes and layouts with new releases'),
+      'callback' => 'update_list_bee_callback',
+      'aliases' => array('ups', 'pm-updatestatus', 'update-status', 'upl'),
+      'bootstrap' => BEE_BOOTSTRAP_FULL,
+      'arguments' => array(
+        'projects' => bt('One or more projects to list updates for.'),
+      ),
+      'optional_arguments' => array('projects'),
+      'multiple_argument' => 'projects',
+      'options' => array(
+        'security-only' => array(
+          'description' => bt('Only list updates for modules that have security updates available.'),
+          'short' => 's',
+        ),
+        'format' => array(
+          'description' => bt('Format to output update information in. Options are "table" (default), "list".'),
+          'value' => bt('table'),
+        ),
+      ),
+      'examples' => array(
+        'bee update-list' => bt('List updates for everything with a new release.'),
+        'bee update-list --security-only' => bt('List only security updates for everything with a new release.'),
+        'bee update-list webform tatsu' => bt('List updates for the Webform module and Tatsu theme only'),
+      ),
+    ),
   );
 }
 
@@ -40,7 +88,6 @@ function update_db_bee_callback() {
     bee_message(bt('There are no pending database updates.'), 'info');
     return;
   }
-
   // Process the list of updates.
   foreach ($pending as $module => $updates) {
     if (!isset($updates['start'])) {
@@ -101,3 +148,132 @@ function update_db_bee_callback() {
     bee_message(bt('All pending updates applied.'), 'success');
   }
 }
+
+/**
+ * Command callback: Show, and apply, module and theme updates.
+ *
+ * @todo  Add core update.
+ * @todo  Consider a way to download first, check the download has worked before delete.
+ *
+ */
+function update_bee_callback($arguments, $options) {
+  global $_bee_backdrop_root;
+  require_once $_bee_backdrop_root . '/core/includes/file.inc';
+  $data = update_bee_get_available_updates($arguments, $options);
+  if ($data != NULL) {
+    update_bee_render_table_output($data);
+    // Prompt to continue.
+    if (!bee_confirm(bt('Would you like to continue?'), FALSE)) {
+      return;
+    }
+    foreach ($data as $item) {
+      $folder = backdrop_get_path($item['project_type'], $item['name']);
+      if (is_dir($folder)) {
+         bee_delete($folder);
+      }
+      download_bee_callback(array('projects' => array($item['name']),), []);
+      echo '';
+    }
+  } else {
+    bee_message(bt('No Modules or Themes to Update'));
+  }
+}
+
+/**
+ * Command callback: Show module and theme updates.
+ */
+function update_list_bee_callback(array $arguments, array $options) {
+  $data = update_bee_get_available_updates($arguments, $options);
+  $is_list_format = isset($options['format']) && $options['format'] === 'list';
+  if ($data == NULL) {
+    if (!$is_list_format) {
+      bee_message(bt('No Modules or Themes to Update'));
+    }
+    return;
+  }
+  if ($is_list_format) {
+    update_bee_render_list_output($data);
+  } else {
+    update_bee_render_table_output($data);
+  }
+}
+
+/**
+ * Get an array of available project updates.
+ *
+ * @param array $arguments
+ *   A list of arguments passed to the command.
+ * @param array $options
+ *   A list of options passed to the command.
+ *
+ * @return array|NULL
+ *   An array of projects with updates available, or NULL if there are none.
+ */
+function update_bee_get_available_updates(array $arguments, array $options) {
+  $data = NULL;
+  if ($available = update_get_available(TRUE)) {
+    module_load_include('inc', 'update', 'update.compare');
+    $data = update_calculate_project_data($available);
+  }
+  if ($data != NULL) {
+    foreach ($data as $item) {
+      if ($item['name'] == 'backdrop') {
+        unset($data['backdrop']);
+        continue;
+      }
+      if (!empty($arguments['projects']) && !in_array($item['name'], $arguments['projects'])) {
+        unset($data[$item['name']]);
+        continue;
+      }
+      if (!isset($item['latest_version'])) {
+        unset($data[$item['name']]);
+        continue;
+      }
+      if ($item['existing_version'] == $item['latest_version']) {
+        unset($data[$item['name']]);
+        continue;
+      }
+      if (isset($options['security-only']) && $item['status'] !== UPDATE_NOT_SECURE) {
+        unset($data[$item['name']]);
+      }
+    }
+  }
+  return $data;
+}
+
+/**
+ * Render available updates as a table.
+ *
+ * @param array $data
+ *   An array of projects with updates available.
+ */
+function update_bee_render_table_output(array $data) {
+  foreach ($data as $item) {
+    $rows[] = array(
+      array('value' => $item['name']),
+      array('value' => $item['existing_version']),
+      array('value' => $item['latest_version']),
+    );
+  }
+  bee_render_text(array('value' => bt("These are the items being updated:\n")));
+  bee_render_table(array(
+    'rows' => $rows,
+    'header' => array(
+      array('value' => bt('Module')),
+      array('value' => bt('Existing')),
+      array('value' => bt('Latest')),
+    ),
+  ));
+}
+
+/**
+ * Render available updates as a list.
+ *
+ * @param array $data
+ *   An array of projects with updates available.
+ */
+function update_bee_render_list_output(array $data) {
+  foreach ($data as $item) {
+    bee_render_text(array('value' => $item['name']));
+  }
+}
diff --git a/includes/render.inc b/includes/render.inc
index 0b729a5..f4984e6 100644
--- a/includes/render.inc
+++ b/includes/render.inc
@@ -375,12 +375,13 @@ function bee_get_column_widths($rows, $header, $delimiter, $delimiter_left, $del
   $table_width += mb_strlen((string) $delimiter_right);
   $table_width += (count($widths) - 1) * mb_strlen((string) $delimiter);
 
-  // Adjust the width of the widest column to fit in the terminal. If a command
-  // outputting a table is run in a non-interactive shell (e.g. as part of an
-  // SSH command) then 'tput cols' on its own will create an error. This
-  // provides an alternative if 'tput cols' create an error.
-  $terminal_width = exec('if tput cols &>/dev/null; then  echo $(tput cols); else $(echo $COLUMNS); fi');
+  // Get the terminal width or set a reasonable default.
+  $terminal_width = (int) exec('echo "$(tput cols 2>/dev/null)"');
+  if (!is_integer($terminal_width) || $terminal_width == 0) {
+    $terminal_width = 140;
+  }
   bee_instant_message(bt('The terminal width is: ') . $terminal_width, 'debug');
+  // Adjust the width of the widest column to fit in the terminal.
   if ($terminal_width && $table_width > $terminal_width) {
     $diff = $table_width - $terminal_width;
     $widths[$widest_column] -= $diff;