diff --git a/CHANGELOG b/CHANGELOG
index c33bb392..b0cbe5a3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,8 @@ v0.6.6 (2011-xx-xx)
     to disable read and write timeouts on connections. The old behaviour of -1 
     is still intact.
 
+  * SUBSCRIBE and PSUBSCRIBE can accept a list of channels for subscription.
+
   * FIX: some client-side clean-ups for MULTI/EXEC were handled incorrectly in 
     a couple of corner cases.
 
diff --git a/lib/Predis.php b/lib/Predis.php
index 65896f8d..6fa3a3be 100644
--- a/lib/Predis.php
+++ b/lib/Predis.php
@@ -1101,14 +1101,7 @@ class PubSubContext implements \Iterator {
 
     private function genericSubscribeInit($subscribeAction) {
         if (isset($this->_options[$subscribeAction])) {
-            if (is_array($this->_options[$subscribeAction])) {
-                foreach ($this->_options[$subscribeAction] as $subscription) {
-                    $this->$subscribeAction($subscription);
-                }
-            }
-            else {
-                $this->$subscribeAction($this->_options[$subscribeAction]);
-            }
+            $this->$subscribeAction($this->_options[$subscribeAction]);
         }
     }
 
@@ -2289,6 +2282,13 @@ class Utils {
         }
         throw $exception;
     }
+
+    public static function filterArrayArguments(Array $arguments) {
+        if (count($arguments) === 1 && is_array($arguments[0])) {
+            return $arguments[0];
+        }
+        return $arguments;
+    }
 }
 
 abstract class MultiBulkResponseIteratorBase implements \Iterator, \Countable {
@@ -3046,8 +3046,11 @@ class Unwatch extends \Predis\MultiBulkCommand {
 
 /* publish/subscribe */
 class Subscribe extends \Predis\MultiBulkCommand {
-    public function canBeHashed()  { return false; }
+    public function canBeHashed() { return false; }
     public function getCommandId() { return 'SUBSCRIBE'; }
+    public function filterArguments(Array $arguments) {
+        return \Predis\Shared\Utils::filterArrayArguments($arguments);
+    }
 }
 
 class Unsubscribe extends \Predis\MultiBulkCommand {
@@ -3056,8 +3059,11 @@ class Unsubscribe extends \Predis\MultiBulkCommand {
 }
 
 class SubscribeByPattern extends \Predis\MultiBulkCommand {
-    public function canBeHashed()  { return false; }
-    public function getCommandId() { return 'PSUBSCRIBE'; }
+    public function canBeHashed() { return false; }
+    public function getCommandId() { return 'UNSUBSCRIBE'; }
+    public function filterArguments(Array $arguments) {
+        return \Predis\Shared\Utils::filterArrayArguments($arguments);
+    }
 }
 
 class UnsubscribeByPattern extends \Predis\MultiBulkCommand {