diff --git a/src/main/java/redis/clients/jedis/BinaryJedis.java b/src/main/java/redis/clients/jedis/BinaryJedis.java
index c6a0cdb..93056a6 100644
--- a/src/main/java/redis/clients/jedis/BinaryJedis.java
+++ b/src/main/java/redis/clients/jedis/BinaryJedis.java
@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -177,10 +178,11 @@ public class BinaryJedis implements BinaryJedisCommands {
      * @param pattern
      * @return Multi bulk reply
      */
-    public List<byte[]> keys(final byte[] pattern) {
+    public Set<byte[]> keys(final byte[] pattern) {
         checkIsInMulti();
         client.keys(pattern);
-        return client.getBinaryMultiBulkReply();
+        final HashSet<byte[]> keySet = new HashSet<byte[]>(client.getBinaryMultiBulkReply());
+        return keySet;
     }
 
     /**
diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java
index 4c95282..ee76869 100644
--- a/src/main/java/redis/clients/jedis/Jedis.java
+++ b/src/main/java/redis/clients/jedis/Jedis.java
@@ -2,6 +2,7 @@ package redis.clients.jedis;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -142,10 +143,11 @@ public class Jedis extends BinaryJedis implements JedisCommands {
      * @param pattern
      * @return Multi bulk reply
      */
-    public List<String> keys(final String pattern) {
+    public Set<String> keys(final String pattern) {
         checkIsInMulti();
         client.keys(pattern);
-        return client.getMultiBulkReply();
+        final HashSet<String> keySet = new HashSet<String>( client.getMultiBulkReply());
+        return keySet;
     }
 
     /**