diff --git a/swh/indexer/fossology_license.py b/swh/indexer/fossology_license.py
index c27bf02..bac3810 100644
--- a/swh/indexer/fossology_license.py
+++ b/swh/indexer/fossology_license.py
@@ -1,183 +1,184 @@
 # Copyright (C) 2016-2018  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 subprocess
 
 from swh.model import hashutil
 
 from .indexer import ContentIndexer, ContentRangeIndexer, DiskIndexer
 
 
 class MixinFossologyLicenseIndexer:
     """Mixin fossology license indexer.
 
     See :class:`ContentFossologyLicenseIndexer` and
     :class:`FossologyLicenseRangeIndexer`
 
     """
     ADDITIONAL_CONFIG = {
         'workdir': ('str', '/tmp/swh/indexer.fossology.license'),
         'tools': ('dict', {
             'name': 'nomos',
             'version': '3.1.0rc2-31-ga2cbb8c',
             'configuration': {
                 'command_line': 'nomossa <filepath>',
             },
         }),
+        'write_batch_size': ('int', 1000),
     }
 
     CONFIG_BASE_FILENAME = 'indexer/fossology_license'
 
     def prepare(self):
         super().prepare()
         self.working_directory = self.config['workdir']
         self.tool = self.tools[0]
 
     def compute_license(self, path, log=None):
         """Determine license from file at path.
 
         Args:
             path: filepath to determine the license
 
         Returns:
             A dict with the following keys:
             - licenses ([str]): associated detected licenses to path
             - path (bytes): content filepath
             - tool (str): tool used to compute the output
 
         """
         try:
             properties = subprocess.check_output(['nomossa', path],
                                                  universal_newlines=True)
             if properties:
                 res = properties.rstrip().split(' contains license(s) ')
                 licenses = res[1].split(',')
 
                 return {
                     'licenses': licenses,
                     'path': path,
                 }
         except subprocess.CalledProcessError:
             if log:
                 from os import path as __path
                 log.exception('Problem during license detection for sha1 %s' %
                               __path.basename(path))
             return {
                 'licenses': [],
                 'path': path,
             }
 
     def index(self, id, data):
         """Index sha1s' content and store result.
 
         Args:
             id (bytes): content's identifier
             raw_content (bytes): raw content in bytes
 
         Returns:
             A dict, representing a content_license, with keys:
               - id (bytes): content's identifier (sha1)
               - license (bytes): license in bytes
               - path (bytes): path
 
         """
         if isinstance(id, str):
             id = hashutil.hash_to_hex(id)
         content_path = self.write_to_temp(
             filename=id,
             data=data)
 
         try:
             properties = self.compute_license(path=content_path, log=self.log)
             properties.update({
                 'id': id,
                 'indexer_configuration_id': self.tool['id'],
             })
         finally:
             self.cleanup(content_path)
 
         return properties
 
     def persist_index_computations(self, results, policy_update):
         """Persist the results in storage.
 
         Args:
             results ([dict]): list of content_license, dict with the
             following keys:
               - id (bytes): content's identifier (sha1)
               - license (bytes): license in bytes
               - path (bytes): path
             policy_update ([str]): either 'update-dups' or 'ignore-dups' to
             respectively update duplicates or ignore them
 
         """
         self.idx_storage.content_fossology_license_add(
             results, conflict_update=(policy_update == 'update-dups'))
 
 
 class ContentFossologyLicenseIndexer(
         MixinFossologyLicenseIndexer, DiskIndexer, ContentIndexer):
     """Indexer in charge of:
     - filtering out content already indexed
     - reading content from objstorage per the content's id (sha1)
     - computing {license, encoding} from that content
     - store result in storage
 
     """
     def filter(self, ids):
         """Filter out known sha1s and return only missing ones.
 
         """
         yield from self.idx_storage.content_fossology_license_missing((
             {
                 'id': sha1,
                 'indexer_configuration_id': self.tool['id'],
             } for sha1 in ids
         ))
 
 
 class FossologyLicenseRangeIndexer(
         MixinFossologyLicenseIndexer, DiskIndexer, ContentRangeIndexer):
     """FossologyLicense Range Indexer working on range of content identifiers.
 
     It:
     - filters out the non textual content
     - (optionally) filters out content already indexed (cf :callable:`range`)
     - reads content from objstorage per the content's id (sha1)
     - computes {mimetype, encoding} from that content
     - stores result in storage
 
     """
     def indexed_contents_in_range(self, start, end):
         """Retrieve indexed content id within range [start, end].
 
         Args
             **start** (bytes): Starting bound from range identifier
             **end** (bytes): End range identifier
 
         Yields:
             Content identifier (bytes) present in the range [start, end]
 
         """
         while start:
             result = self.idx_storage.content_fossology_license_get_range(
                 start, end, self.tool['id'])
             contents = result['ids']
             for _id in contents:
                 yield _id
             start = result['next']
 
 
 @click.command(help='Compute license for path using tool')
 @click.option('--tool', default='nomossa', help="Path to tool")
 @click.option('--path', required=1, help="Path to execute index on")
 def main(tool, path):
     indexer = ContentFossologyLicenseIndexer()
     print(indexer.compute_license(tool, path))
 
 
 if __name__ == '__main__':
     main()