diff --git a/swh/indexer/__init__.py b/swh/indexer/__init__.py
index f7cb4fb..8ea5175 100644
--- a/swh/indexer/__init__.py
+++ b/swh/indexer/__init__.py
@@ -1,28 +1,29 @@
 # Copyright (C) 2016  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 
 INDEXER_CLASSES = {
     'mimetype': 'swh.indexer.mimetype.ContentMimetypeIndexer',
     'language': 'swh.indexer.language.ContentLanguageIndexer',
     'ctags': 'swh.indexer.ctags.CtagsIndexer',
     'fossology_license':
     'swh.indexer.fossology_license.ContentFossologyLicenseIndexer',
 }
 
 
 TASK_NAMES = {
     'orchestrator_all': 'swh.indexer.tasks.SWHOrchestratorAllContentsTask',
     'orchestrator_text': 'swh.indexer.tasks.SWHOrchestratorTextContentsTask',
     'mimetype': 'swh.indexer.tasks.SWHContentMimetypeTask',
     'language': 'swh.indexer.tasks.SWHContentLanguageTask',
     'ctags': 'swh.indexer.tasks.SWHCtagsTask',
     'fossology_license': 'swh.indexer.tasks.SWHContentFossologyLicenseTask',
+    'rehash': 'swh.indexer.tasks.SWHRecomputeChecksums',
 }
 
 
 __all__ = [
     'INDEXER_CLASSES', 'TASK_NAMES',
 ]
diff --git a/swh/indexer/producer.py b/swh/indexer/producer.py
index a0b984a..588bb69 100755
--- a/swh/indexer/producer.py
+++ b/swh/indexer/producer.py
@@ -1,70 +1,85 @@
 # Copyright (C) 2016-2017  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import click
 import random
 import sys
 
 from swh.core import utils
 from swh.model import hashutil
 from swh.scheduler.utils import get_task
 
 
 def read_from_stdin():
     for sha1 in sys.stdin:
         yield hashutil.hash_to_bytes(sha1.strip())
 
 
-def gen_sha1(batch):
+def gen_sha1(batch, dict_with_key=None):
     """Generate batch of grouped sha1s from the objstorage.
 
     """
-    for sha1s in utils.grouper(read_from_stdin(), batch):
-        sha1s = list(sha1s)
-        random.shuffle(sha1s)
-        yield sha1s
+    def _gen():
+        for sha1s in utils.grouper(read_from_stdin(), batch):
+            sha1s = list(sha1s)
+            random.shuffle(sha1s)
+            yield sha1s
+
+    if dict_with_key:
+        for sha1s in _gen():
+            yield [{dict_with_key: sha1} for sha1 in sha1s]
+    else:
+        yield from _gen()
 
 
-def run_with_limit(task, limit, batch):
+def run_with_limit(task, limit, batch, dict_with_key=None):
     count = 0
-    for sha1s in gen_sha1(batch):
+    for sha1s in gen_sha1(batch, dict_with_key):
         count += len(sha1s)
         print('%s sent - [%s, ...]' % (len(sha1s), sha1s[0]))
         task.delay(sha1s)
         if count >= limit:
             return
 
 
-def run_no_limit(task, batch):
-    for sha1s in gen_sha1(batch):
+def run(task, batch, dict_with_key=None):
+    for sha1s in gen_sha1(batch, dict_with_key):
         print('%s sent - [%s, ...]' % (len(sha1s), sha1s[0]))
         task.delay(sha1s)
 
 
 @click.command(help='Read sha1 from stdin and send them for indexing')
 @click.option('--limit', default=None, help='Limit the number of data to read')
 @click.option('--batch', default='10', help='Group data by batch')
 @click.option('--task-name', default='orchestrator_all', help='')
-def main(limit, batch, task_name):
+@click.option('--dict-with-key', default=None)
+def main(limit, batch, task_name, dict_with_key):
+    """Read sha1 from stdin and send them for indexing.
+
+    By default, send directly list of hashes.  Using the
+    --dict-with-key, this will send dict list with one key mentioned
+    as parameter to the dict-with-key flag.
+
+    """
     batch = int(batch)
 
     from . import tasks, TASK_NAMES  # noqa
     possible_tasks = TASK_NAMES.keys()
 
     if task_name not in possible_tasks:
         print('The task_name can only be one of %s' %
               ', '.join(possible_tasks))
         return
 
     task = get_task(TASK_NAMES[task_name])
 
     if limit:
-        run_with_limit(task, int(limit), batch)
+        run_with_limit(task, int(limit), batch, dict_with_key)
     else:
-        run_no_limit(task, batch)
+        run(task, batch, dict_with_key)
 
 
 if __name__ == '__main__':
     main()