diff --git a/salt/returners/redis_return.py b/salt/returners/redis_return.py
index <HASH>..<HASH> 100644
--- a/salt/returners/redis_return.py
+++ b/salt/returners/redis_return.py
@@ -21,4 +21,7 @@ def returner(ret):
             host=__opts__['redis.host'],
             port=__opts__['redis.port'],
             db=__opts__['redis.db'])
-    serv.set(ret['id'] + ':' + ret['jid'], json.dumps(ret['return']))
+    serv.sadd(ret['id'] + 'jobs', ret['jid'])
+    serv.set(ret['jid'] + ':' + ret['id'], json.dumps(ret['return']))
+    serv.sadd('jobs', ret['jid'])
+    serv.sadd(ret['jid'], ret['id'])
Change the redis returner to better use data structures