diff --git a/PHPCI/Plugin/Shell.php b/PHPCI/Plugin/Shell.php
index d86b6e1b..b9949cd3 100644
--- a/PHPCI/Plugin/Shell.php
+++ b/PHPCI/Plugin/Shell.php
@@ -1,11 +1,11 @@
 <?php
 /**
-* PHPCI - Continuous Integration for PHP
-*
-* @copyright    Copyright 2013, Block 8 Limited.
-* @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
-* @link         http://www.phptesting.org/
-*/
+ * PHPCI - Continuous Integration for PHP
+ *
+ * @copyright    Copyright 2013, Block 8 Limited.
+ * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
+ * @link         http://www.phptesting.org/
+ */
 
 namespace PHPCI\Plugin;
 
@@ -13,43 +13,63 @@ use PHPCI\Builder;
 use PHPCI\Model\Build;
 
 /**
-* Shell Plugin - Allows execute shell commands.
-* @author       Kinn Coelho Julião <kinncj@gmail.com>
-* @package      PHPCI
-* @subpackage   Plugins
-*/
+ * Shell Plugin - Allows execute shell commands.
+ * @author       Kinn Coelho Julião <kinncj@gmail.com>
+ * @package      PHPCI
+ * @subpackage   Plugins
+ */
 class Shell implements \PHPCI\Plugin
 {
     protected $args;
     protected $phpci;
 
     /**
-     * @var string $command The command to be executed
+     * @var string[] $commands The commands to be executed
      */
-    protected $command;
+    protected $commands = array();
 
     public function __construct(Builder $phpci, Build $build, array $options = array())
     {
         $this->phpci        = $phpci;
 
         if (isset($options['command'])) {
-            $command       = $options['command'];
-            $command       = str_replace("%buildpath%", $this->phpci->buildPath, $command);
-            $this->command = $command;
+            // Keeping this for backwards compatibility, new projects should use interpolation vars.
+            $options['command'] = str_replace("%buildpath%", $this->phpci->buildPath, $options['command']);
+            $this->commands = array($options['command']);
+            return;
+        }
+
+        /*
+         * Support the new syntax:
+         *
+         * shell:
+         *     - "cd /www"
+         *     - "rm -f file.txt"
+         */
+        if (is_array($options)) {
+            $this->commands = $options;
         }
     }
 
     /**
-    * Runs the shell command.
-    */
+     * Runs the shell command.
+     */
     public function execute()
     {
         if (!defined('ENABLE_SHELL_PLUGIN') || !ENABLE_SHELL_PLUGIN) {
             throw new \Exception('The shell plugin is not enabled.');
         }
-        
-        $success = $this->phpci->executeCommand($this->command);
-        
+
+        $success = true;
+
+        foreach ($this->commands as $command) {
+            $command = $this->phpci->interpolate($command);
+
+            if (!$this->phpci->executeCommand($command)) {
+                $success = false;
+            }
+        }
+
         return $success;
     }
 }