From a378a2104d7c5a8a84468a39b8e0d3ad87ba9e48 Mon Sep 17 00:00:00 2001
From: Kai Hammerschmidt <kai.hammerschmidt@metaeffekt.com>
Date: Wed, 19 Aug 2026 11:04:29 +0200
Subject: [PATCH 1/3] Fix regex for manpage detection

Signed-off-by: Kai Hammerschmidt <kai.hammerschmidt@metaeffekt.com>
---
 src/cluecode/copyrights.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cluecode/copyrights.py b/src/cluecode/copyrights.py
index 6d17467acf..5b2bf12b2c 100644
--- a/src/cluecode/copyrights.py
+++ b/src/cluecode/copyrights.py
@@ -4452,7 +4452,7 @@ def collect_candidate_lines(numbered_lines):
 remove_weird_comment_markers = re.compile(r'^(rem|\@rem|dnl)\s+').sub
 
 # common comment line prefix in man pages
-remove_man_comment_markers = re.compile(r'\."').sub
+remove_man_comment_markers = re.compile(r'^\.\\"').sub
 
 
 def remove_code_comment_markers(s):

From 9af08553bc1365a45cf2491b4b120a4f853a0372 Mon Sep 17 00:00:00 2001
From: Kai Hammerschmidt <kai.hammerschmidt@metaeffekt.com>
Date: Thu, 30 Jul 2026 12:11:31 +0200
Subject: [PATCH 2/3] Add option for allrights scanning

Clean up organize imports

Adapt refinement for allrights scanning

Signed-off-by: Kai Hammerschmidt <kai.hammerschmidt@metaeffekt.com>
---
 pyproject.toml                   |  1 +
 src/cluecode/copyrights.py       | 40 +++++++++++--
 src/cluecode/plugin_allrights.py | 61 ++++++++++++++++++++
 src/scancode/api.py              | 97 ++++++++++++++++++++++----------
 4 files changed, 163 insertions(+), 36 deletions(-)
 create mode 100644 src/cluecode/plugin_allrights.py

diff --git a/pyproject.toml b/pyproject.toml
index f2371c6bb2..8b7f4679cb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -272,6 +272,7 @@ facet = "summarycode.facet:AddFacet"
 info = "scancode.plugin_info:InfoScanner"
 licenses = "licensedcode.plugin_license:LicenseScanner"
 copyrights = "cluecode.plugin_copyright:CopyrightScanner"
+allrights = "cluecode.plugin_allrights:AllrightsCopyrightScanner"
 packages = "packagedcode.plugin_package:PackageScanner"
 emails = "cluecode.plugin_email:EmailScanner"
 urls = "cluecode.plugin_url:UrlScanner"
diff --git a/src/cluecode/copyrights.py b/src/cluecode/copyrights.py
index 5b2bf12b2c..4faeb6e68a 100644
--- a/src/cluecode/copyrights.py
+++ b/src/cluecode/copyrights.py
@@ -336,20 +336,25 @@ def detect(self,
             tree_node_label = tree_node.label
 
             if (include_copyrights or include_holders) and 'COPYRIGHT' in tree_node_label:
-                copyrght = build_detection_from_node(
+                if include_copyright_allrights:
+                    refiner = refine_allrights
+                else:
+                    refiner = refine_copyright
+
+                copyright = build_detection_from_node(
                     node=tree_node,
                     cls=CopyrightDetection,
                     ignored_labels=non_copyright_labels,
                     include_copyright_allrights=include_copyright_allrights,
-                    refiner=refine_copyright,
+                    refiner=refiner,
                 )
 
                 if TRACE or TRACE_DEEP:
-                    logger_debug(f'CopyrightDetector: final copyright: {copyrght}')
+                    logger_debug(f'CopyrightDetector: final copyright: {copyright}')
 
-                if copyrght:
+                if copyright:
                     if include_copyrights:
-                        yield copyrght
+                        yield copyright
 
                     if include_holders:
                         # By default we strip email and urls from holders ....
@@ -3562,6 +3567,31 @@ def refine_copyright(c):
     return c.strip()
 
 
+def refine_allrights(c):
+    """
+    Refine a detected copyright string.
+    FIXME: the grammar should not allow this to happen.
+    """
+    if not c:
+        return
+    c = ' '.join(c.split())
+    c = strip_some_punct(c)
+    c = strip_solo_quotes(c)
+    # this catches trailing slashes in URL for consistency
+    c = c.strip('/ ~')
+    c = strip_all_unbalanced_parens(c)
+    c = remove_some_extra_words_and_punct(c)
+    c = ' '.join(c.split())
+    c = remove_dupe_copyright_words(c)
+    c = strip_prefixes(c, prefixes=set(['by', 'c']))
+    c = c.strip()
+    c = c.strip('+')
+    c = strip_balanced_edge_parens(c)
+    c = strip_suffixes(c, suffixes=COPYRIGHTS_SUFFIXES)
+    c = c.strip("'")
+    return c.strip()
+
+
 def remove_dupe_holder(h):
     """
     Remove duplicated holders
diff --git a/src/cluecode/plugin_allrights.py b/src/cluecode/plugin_allrights.py
new file mode 100644
index 0000000000..2bb8ee3d1f
--- /dev/null
+++ b/src/cluecode/plugin_allrights.py
@@ -0,0 +1,61 @@
+#
+# This code is heavily inspired by original code from ScanCode Toolkit.
+# The copyright header is therefore propagated. The content is primarily
+# taken from following packages in the ScanCode Toolkit:
+# - cluecode.plugin_copyright
+# - scancode.api
+#
+# Copyright (c) nexB Inc. and others. All rights reserved.
+# ScanCode is a trademark of nexB Inc.
+# SPDX-License-Identifier: Apache-2.0
+# See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
+# See https://github.com/nexB/scancode-toolkit for support or download.
+# See https://aboutcode.org for more information about nexB OSS projects.
+#
+
+import attr
+from plugincode.scan import ScanPlugin
+from plugincode.scan import scan_impl
+
+from commoncode.cliutils import PluggableCommandLineOption
+from commoncode.cliutils import SCAN_GROUP
+
+
+@scan_impl
+class AllrightsCopyrightScanner(ScanPlugin):
+    """Scan a Resource for copyrights with all rights reserved. This class is an adapted version of
+    scancodes cluecode.plugin_copyright.
+    """
+
+    resource_attributes = dict(
+        [
+            ("copyrights", attr.ib(default=attr.Factory(list))),
+            ("holders", attr.ib(default=attr.Factory(list))),
+            ("authors", attr.ib(default=attr.Factory(list))),
+        ]
+    )
+
+    run_order = 6
+    sort_order = 6
+
+    options = [
+        PluggableCommandLineOption(
+            (
+                "-a",
+                "--allrights",
+            ),
+            is_flag=True,
+            default=False,
+            help="Scan <input> for copyrights and all rights reserved.",
+            help_group=SCAN_GROUP,
+            sort_order=50,
+        ),
+    ]
+
+    def is_enabled(self, allrights, **kwargs):  # NOQA
+        return allrights
+
+    def get_scanner(self, **kwargs):
+        from scancode.api import allrights_scanner
+        return allrights_scanner
+
diff --git a/src/scancode/api.py b/src/scancode/api.py
index 71382f4a6a..433f1d3580 100644
--- a/src/scancode/api.py
+++ b/src/scancode/api.py
@@ -6,16 +6,17 @@
 # See https://github.com/nexB/scancode-toolkit for support or download.
 # See https://aboutcode.org for more information about nexB OSS projects.
 #
-from itertools import islice
-from os.path import getsize
 import logging
 import os
 import sys
+from itertools import islice
+from os.path import getsize
+
+from typecode.contenttype import get_type
 
 from commoncode.filetype import get_last_modified_date
 from commoncode.hash import multi_checksums
 from scancode import ScancodeError
-from typecode.contenttype import get_type
 
 TRACE = os.environ.get('SCANCODE_DEBUG_API', False)
 
@@ -30,6 +31,7 @@ def logger_debug(*args):
     logging.basicConfig(stream=sys.stdout)
     logger.setLevel(logging.DEBUG)
 
+
     def logger_debug(*args):
         return logger.debug(
             ' '.join(isinstance(a, str) and a or repr(a) for a in args)
@@ -46,9 +48,9 @@ def logger_debug(*args):
 
 
 def get_copyrights(
-    location,
-    deadline=sys.maxsize,
-    **kwargs,
+        location,
+        deadline=sys.maxsize,
+        **kwargs,
 ):
     """
     Return a mapping with a single 'copyrights' key with a value that is a list
@@ -79,12 +81,45 @@ def get_copyrights(
     return results
 
 
+def allrights_scanner(
+        location,
+        deadline=sys.maxsize,
+        **kwargs,
+):
+    """Return a mapping with a single 'copyrights' key with a value that is a list
+    of mappings for copyright detected in the file at `location`.
+    Adapted copy of scancodes scancode.api.get_copyrights.
+    """
+    from cluecode.copyrights import detect_copyrights
+    from cluecode.copyrights import Detection
+
+    detections = detect_copyrights(
+        location,
+        include_copyrights=True,
+        include_holders=True,
+        include_authors=True,
+        include_copyright_years=True,
+        include_copyright_allrights=True,
+        deadline=deadline,
+    )
+
+    copyrights, holders, authors = Detection.split(detections, to_dict=True)
+
+    results = dict([
+        ('copyrights', copyrights),
+        ('holders', holders),
+        ('authors', authors),
+    ])
+
+    return results
+
+
 def get_emails(
-    location,
-    threshold=50,
-    test_slow_mode=False,
-    test_error_mode=False,
-    **kwargs,
+        location,
+        threshold=50,
+        test_slow_mode=False,
+        test_error_mode=False,
+        **kwargs,
 ):
     """
     Return a mapping with a single 'emails' key with a value that is a list of
@@ -148,14 +183,14 @@ def get_urls(location, threshold=50, **kwargs):
 
 
 def get_licenses(
-    location,
-    min_score=0,
-    include_text=False,
-    license_text_diagnostics=False,
-    license_diagnostics=False,
-    deadline=sys.maxsize,
-    unknown_licenses=False,
-    **kwargs,
+        location,
+        min_score=0,
+        include_text=False,
+        license_text_diagnostics=False,
+        license_diagnostics=False,
+        deadline=sys.maxsize,
+        unknown_licenses=False,
+        **kwargs,
 ):
     """
     Return a mapping or license_detections for licenses detected in the file at
@@ -257,12 +292,12 @@ def get_licenses(
 
 
 def _get_package_data(
-    location,
-    application=True,
-    system=False,
-    compiled=False,
-    package_only=False, 
-    **kwargs
+        location,
+        application=True,
+        system=False,
+        compiled=False,
+        package_only=False,
+        **kwargs
 ):
     """
     Return a mapping of package manifest information detected in the file at ``location``.
@@ -309,12 +344,12 @@ def get_package_info(location, **kwargs):
 
 
 def get_package_data(
-    location,
-    application=True,
-    system=False,
-    compiled=False,
-    package_only=False,
-    **kwargs
+        location,
+        application=True,
+        system=False,
+        compiled=False,
+        package_only=False,
+        **kwargs
 ):
     """
     Return a mapping of package manifest information detected in the file at

From 3af48bc8139a593a110f3670440b9dc70cef0c84 Mon Sep 17 00:00:00 2001
From: Kai Hammerschmidt <kai.hammerschmidt@metaeffekt.com>
Date: Tue, 4 Aug 2026 14:56:14 +0200
Subject: [PATCH 3/3] Adapt test expectation files to new all rights reserved
 mode

fix broken expectations

run tests also with all rights reserved

Signed-off-by: Kai Hammerschmidt <kai.hammerschmidt@metaeffekt.com>
---
 tests/cluecode/cluecode_test_utils.py         |  13 +-
 .../data/authors/author-config.rpath.yml      |   2 +
 .../data/authors/author_addr_c-addr_c.c.yml   |   3 +
 .../author_avinash-BitVector_py.py.yml        |   2 +
 .../author_avinash_kak-BitVector_py.py.yml    |   2 +
 .../author_complex_author-strtol_c.c.yml      |   2 +
 .../author_correct-detail_9_html.html.yml     |   2 +
 .../data/authors/author_expat-expat_h.h.yml   |   2 +
 .../author_gary-ProjectInfo_java.java.yml     |   2 +
 .../author_in_java-MergeSort_java.java.yml    |   2 +
 .../authors/author_in_java_tag-java.java.yml  |   2 +
 .../authors/author_in_postcript-9__ps.ps.yml  |   2 +
 .../data/authors/author_none_c-c.c.yml        |   2 +
 .../author_none_sample_java-java.java.yml     |   2 +
 .../data/authors/author_samplepy-py.py.yml    |   2 +
 ...thor_stacktrace_cpp-stacktrace_cpp.cpp.yml |   2 +
 ...r_java-TreeTableModelAdapter_java.java.yml |   2 +
 .../data/authors/author_uc-LICENSE.yml        |   5 +
 .../author_var_route_c-var_route_c.c.yml      |   3 +
 tests/cluecode/data/authors/configure.yml     |   6 +
 tests/cluecode/data/authors/device_tree.c.yml |   2 +
 .../cluecode/data/authors/expat-ltmain.sh.yml |   3 +
 tests/cluecode/data/authors/fixed_bfin.h.yml  |   2 +
 ...m_and_authors_are_detected_authors.txt.yml |   2 +
 .../authors/is_not_mixed_with_authors.txt.yml |   2 +
 tests/cluecode/data/authors/libtool.m4.yml    |   3 +
 tests/cluecode/data/authors/ltcf-c.sh.yml     |   2 +
 tests/cluecode/data/authors/ltcf-cxx.sh.yml   |   2 +
 tests/cluecode/data/authors/ltmain.sh.yml     |   3 +
 tests/cluecode/data/authors/mcbsp.h.yml       |   2 +
 .../data/authors/memory-input-stream.c.yml    |   2 +
 tests/cluecode/data/authors/strverscmp.c.yml  |   2 +
 tests/cluecode/data/authors/strverscmp2.c.yml |   2 +
 .../data/authors/vcdiff-ltmain.sh.yml         |   3 +
 tests/cluecode/data/authors/wcstok.c.yml      |   3 +
 ...ith_date_in_angle_brackets_authors.txt.yml |   2 +
 .../data/copyright_fossology/testdata0.yml    |   5 +
 .../data/copyright_fossology/testdata1.yml    |   2 +
 .../data/copyright_fossology/testdata10.yml   |   2 +
 .../data/copyright_fossology/testdata100.yml  |   6 +
 .../data/copyright_fossology/testdata109.yml  |   4 +
 .../data/copyright_fossology/testdata114.yml  |   3 +
 .../data/copyright_fossology/testdata115.yml  |   3 +
 .../data/copyright_fossology/testdata118.yml  |  18 +++
 .../data/copyright_fossology/testdata119.yml  |  18 +++
 .../data/copyright_fossology/testdata12.yml   |   2 +
 .../data/copyright_fossology/testdata120.yml  |   7 +
 .../data/copyright_fossology/testdata121.yml  |   7 +
 .../data/copyright_fossology/testdata122.yml  |   7 +
 .../data/copyright_fossology/testdata123.yml  |   3 +
 .../data/copyright_fossology/testdata124.yml  |   3 +
 .../data/copyright_fossology/testdata126.yml  |   7 +
 .../data/copyright_fossology/testdata127.yml  |   2 +
 .../data/copyright_fossology/testdata128.yml  |  18 +++
 .../data/copyright_fossology/testdata132.yml  |   2 +
 .../data/copyright_fossology/testdata133.yml  |  11 ++
 .../data/copyright_fossology/testdata135.yml  |   2 +
 .../data/copyright_fossology/testdata136.yml  |   3 +
 .../data/copyright_fossology/testdata138.yml  |   3 +
 .../data/copyright_fossology/testdata139.yml  |  11 ++
 .../data/copyright_fossology/testdata14.yml   |   3 +
 .../data/copyright_fossology/testdata15.yml   |   2 +
 .../data/copyright_fossology/testdata16.yml   |   3 +
 .../data/copyright_fossology/testdata17.yml   |   3 +
 .../data/copyright_fossology/testdata18.yml   |   5 +
 .../data/copyright_fossology/testdata20.yml   |   3 +
 .../data/copyright_fossology/testdata22.yml   |   2 +
 .../data/copyright_fossology/testdata26.yml   |   2 +
 .../data/copyright_fossology/testdata27.yml   |   2 +
 .../data/copyright_fossology/testdata29.yml   |   2 +
 .../data/copyright_fossology/testdata33.yml   |   3 +
 .../data/copyright_fossology/testdata35.yml   |  28 ++++
 .../data/copyright_fossology/testdata36.yml   |  28 ++++
 .../data/copyright_fossology/testdata37.yml   |  28 ++++
 .../data/copyright_fossology/testdata39.yml   |  28 ++++
 .../data/copyright_fossology/testdata4.yml    |   2 +
 .../data/copyright_fossology/testdata40.yml   |   2 +
 .../data/copyright_fossology/testdata41.yml   |   2 +
 .../data/copyright_fossology/testdata43.yml   |   2 +
 .../data/copyright_fossology/testdata44.yml   |   3 +
 .../data/copyright_fossology/testdata46.yml   |  21 +++
 .../data/copyright_fossology/testdata47.yml   |   2 +
 .../data/copyright_fossology/testdata48.yml   |   2 +
 .../data/copyright_fossology/testdata49.yml   |   2 +
 .../data/copyright_fossology/testdata5.yml    |   2 +
 .../data/copyright_fossology/testdata52.yml   |   2 +
 .../data/copyright_fossology/testdata53.yml   |   2 +
 .../data/copyright_fossology/testdata56.yml   |   4 +
 .../data/copyright_fossology/testdata58.yml   |   3 +
 .../data/copyright_fossology/testdata61.yml   |  20 +++
 .../data/copyright_fossology/testdata7.yml    |   5 +
 .../data/copyright_fossology/testdata72.yml   |   3 +
 .../data/copyright_fossology/testdata73.yml   |   7 +
 .../data/copyright_fossology/testdata75.yml   |   5 +
 .../data/copyright_fossology/testdata76.yml   |   4 +
 .../data/copyright_fossology/testdata77.yml   |   3 +
 .../data/copyright_fossology/testdata89.yml   |   2 +
 .../data/copyright_fossology/testdata90.yml   |   4 +
 .../data/copyright_fossology/testdata92.yml   |   2 +
 .../data/copyright_fossology/testdata93.yml   |  13 ++
 .../data/copyright_fossology/testdata97.yml   |   5 +
 .../copyrights/AliasDotCom_Website.html.yml   |   2 +
 .../data/copyrights/AssemblyInfoCommon.cs.yml |   3 +
 ...IGHT_madwifi-COPYRIGHT_madwifi.madwifi.yml |   2 +
 .../data/copyrights/README-README.yml         |   2 +
 .../copyrights/abc_loss_of_holder_c-c.c.yml   |   2 +
 tests/cluecode/data/copyrights/acme_c-c.c.yml |   2 +
 ...ttribute_cs-ActiveFieldAttribute_cs.cs.yml |   2 +
 .../data/copyrights/addr_c-addr_c.c.yml       |   3 +
 .../cluecode/data/copyrights/adobe-Adobe.yml  |   2 +
 ...be_flashplugin-adobe_flashplugin.label.yml |   3 +
 .../data/copyrights/adobe_license.txt.yml     |   2 +
 .../data/copyrights/affiliates.txt.yml        |   2 +
 .../data/copyrights/afl_v3_0-AFL_v.0.yml      |   2 +
 ...ic_license-Aladdin_Free_Public_License.yml |   2 +
 tests/cluecode/data/copyrights/alt.txt.yml    |   2 +
 .../data/copyrights/and_authors_mixed.txt.yml |   3 +
 .../copyrights/and_the_contributors.txt.yml   |   2 +
 .../data/copyrights/andre_darcy-c.c.yml       |   3 +
 .../data/copyrights/android_c-c.c.yml         |   3 +
 ...bian_trailing_name_missed-apache.label.yml |  30 ++++
 .../data/copyrights/apache_notice-NOTICE.yml  |   5 +
 .../data/copyrights/apachev1_0-Apachev.0.yml  |   2 +
 .../data/copyrights/apachev1_1-Apachev.1.yml  |   2 +
 ...e_v1_0-Apple_Public_Source_License_v.0.yml |   2 +
 ...e_v1_1-Apple_Public_Source_License_v.1.yml |   2 +
 ...e_v1_2-Apple_Public_Source_License_v.2.yml |   2 +
 .../data/copyrights/apslv2_0-APSLv.0.yml      |   2 +
 ...istic_v2_0beta4-Artistic_v_beta.0beta4.yml |   2 +
 .../copyrights/artisticv2_0-Artisticv.0.yml   |   2 +
 .../atheros_spanning_lines-py.py.yml          |   4 +
 .../cluecode/data/copyrights/audio_c-c.c.yml  |   2 +
 .../data/copyrights/author_young_c-c.c.yml    |   3 +
 .../data/copyrights/authors_at_ucl.txt.yml    |   2 +
 .../bigelow_holmes-Bigelow&Holmes.yml         |   3 +
 .../data/copyrights/bitstream-Bi_ream.yml     |   2 +
 .../cluecode/data/copyrights/brackets.txt.yml |   2 +
 tests/cluecode/data/copyrights/bv.txt.yml     |   3 +
 tests/cluecode/data/copyrights/c-c.c.yml      |   2 +
 .../data/copyrights/c_include-h.h.yml         |   2 +
 .../data/copyrights/ccube_txt.txt.yml         |   2 +
 .../cern-TestMatrix_D_java.java.yml           |   2 +
 ...n_matrix2d_java-TestMatrix_D_java.java.yml |   4 +
 tests/cluecode/data/copyrights/cnri-CNRI.yml  |   2 +
 .../copyrights/colin_android-bsdiff_c.c.yml   |   3 +
 .../data/copyrights/company_in_txt-9.txt.yml  |   2 +
 .../company_name_in_java-9_java.java.yml      |   2 +
 ...complex_4_line_statement_in_text-9.txt.yml |   3 +
 .../data/copyrights/complex_notice-NOTICE.yml |  27 ++++
 ..._microsystems_on_multiple_lines-NOTICE.yml |   9 ++
 .../data/copyrights/composite_copy.txt.yml    |   2 +
 .../copyrights/condor_extra_For-Condor.yml    |   2 +
 .../copyrights/copyright_without_icon.txt.yml |   2 +
 .../copytest/and_subsidiaries.txt.yml         |   2 +
 .../copytest/hp_co_or_company.txt.yml         |   4 +
 .../copyrights/copytest/two_lines.txt.yml     |   2 +
 .../copytest/with_caps_and_dots.txt.yml       |   2 +
 .../copytest/with_debian_s_tag.txt.yml        |   2 +
 ...h_lead_copy_sign_and_debian_s_tags.txt.yml |   3 +
 .../copytest/with_more_debian_s_tags.txt.yml  |   2 +
 .../copytest/with_trailing_software.txt.yml   |   2 +
 .../copytest/with_trailing_year.txt.yml       |   2 +
 .../coreutils_debian-coreutils.copyright.yml  |  20 +++
 .../data/copyrights/dag_c-s_fabsl_c.c.yml     |   2 +
 .../copyrights/dag_elring_notice-NOTICE.yml   |   2 +
 .../copyrights/date_range_dahua_in_c-c.c.yml  |   2 +
 .../debian_lib_1-libmono_cairo_cil.label.yml  |  16 ++
 ...bian_lib_2-libmono_cairo_cil.copyright.yml |  16 ++
 ...n_lib_3-libmono_security_cil.copyright.yml |  16 ++
 ...i_names_on_one_line-libgdata.copyright.yml |  20 +++
 ...re_desktop-djvulibre_desktop.copyright.yml |   4 +
 tests/cluecode/data/copyrights/doc-DOC.yml    |   2 +
 ...oc_html-docbook_xsl_doc_html.copyright.yml |   5 +
 .../does_not_truncate_last_name.txt.yml       |   2 +
 .../data/copyrights/drand48_c-drand_c.c.yml   |   2 +
 .../copyrights/dual_mpl_gpl-Dual_MPL_GPL.yml  |   2 +
 .../data/copyrights/ed-ed.copyright.yml       |   5 +
 .../data/copyrights/entessa-Entessa.yml       |   2 +
 ...owser_data-epiphany_browser_data.label.yml |   3 +
 .../data/copyrights/eplv1_0b-EPLv_b.0b.yml    |   2 +
 .../data/copyrights/eric_young_c-c.c.yml      |   3 +
 .../data/copyrights/errno_atheros-c.c.yml     |   2 +
 .../copyrights/errno_atheros_ah_h-ah_h.h.yml  |   2 +
 .../cluecode/data/copyrights/errno_c-c.c.yml  |   2 +
 .../data/copyrights/error-prone.txt.yml       |   2 +
 tests/cluecode/data/copyrights/et_al.txt.yml  |   2 +
 .../data/copyrights/eudatagrid-EUDatagrid.yml |   2 +
 .../data/copyrights/freebsd-FreeBSD.yml       |   2 +
 .../data/copyrights/freetype-FreeType.yml     |   4 +
 tests/cluecode/data/copyrights/gailly-c.c.yml |   4 +
 .../cluecode/data/copyrights/glide-Glide.yml  |   4 +
 .../data/copyrights/grapelli_content.css.yml  |   2 +
 .../cluecode/data/copyrights/gsoap-gSOAP.yml  |   3 +
 tests/cluecode/data/copyrights/h-h.h.yml      |   2 +
 .../hans_jurgen_htm-9_html.html.yml           |   2 +
 .../data/copyrights/hansen_cs-cs.cs.yml       |   2 +
 .../data/copyrights/heunrich_c-c.c.yml        |   2 +
 .../hewlett_packard-Hewlett_Packard.yml       |   2 +
 .../cluecode/data/copyrights/holders.txt.yml  |   3 +
 .../holtmann-hciattach_qualcomm_c.c.yml       |   3 +
 .../hpijs_ppds-hpijs_ppds.label.yml           |   5 +
 .../data/copyrights/ibmpl_v1_0-IBMPL_v.0.yml  |   2 +
 tests/cluecode/data/copyrights/ietf-IETF.yml  |   2 +
 tests/cluecode/data/copyrights/ijg-IJG.yml    |   6 +
 .../copyrights/illinois_html-9_html.html.yml  |   2 +
 .../data/copyrights/imatix-iMatix.yml         |   6 +
 .../data/copyrights/in_docstring.py.yml       |   2 +
 tests/cluecode/data/copyrights/index.html.yml |  23 +++
 tests/cluecode/data/copyrights/index.txt.yml  |  23 +++
 .../cluecode/data/copyrights/intel-Intel.yml  |   2 +
 tests/cluecode/data/copyrights/isc-c.c.yml    |   2 +
 .../data/copyrights/jabber-Jabber.yml         |   3 +
 .../data/copyrights/java-java.java.yml        |   2 +
 .../data/copyrights/jcraft_copyright.txt.yml  |   2 +
 tests/cluecode/data/copyrights/jdoe-c.c.yml   |   2 +
 .../data/copyrights/jpython-JPython.yml       |   2 +
 .../copyrights/jquery.flot.navigate.js.yml    |   2 +
 .../data/copyrights/larryrosen-LarryRosen.yml |   2 +
 .../copyrights/libadns1-libadns.copyright.yml |   4 +
 .../libc6_i686-libc_i.copyright.yml           |   9 ++
 .../copyrights/libcdio10-libcdio.label.yml    |  20 +++
 ...ay_perl-libcrypt_ssleay_perl.copyright.yml |   4 +
 .../libgoffice_0_8-libgoffice.label.yml       |   2 +
 .../copyrights/libisc44-libisc.copyright.yml  |   2 +
 .../libisccfg30-libisccfg.copyright.yml       |   2 +
 .../libisccfg40-libisccfg.copyright.yml       |   2 +
 .../libjpeg62-libjpeg.copyright.yml           |   6 +
 ..._gettext_perl-liblocale_get_perl.label.yml |   2 +
 .../libopenraw1-libopenraw.label.yml          |  11 ++
 ...openthreads12-libopenthreads.copyright.yml |   3 +
 ...cripttools-libqt_scripttools.copyright.yml |   3 +
 ...tscript4_gui-libqtscript_gui.copyright.yml |   5 +
 .../libsocks4-libsocks.copyright.yml          |   3 +
 .../copyrights/libuim6-libuim.copyright.yml   |  11 ++
 .../copyrights/libxext6-libxext.copyright.yml |  10 ++
 .../libxmlrpc_c3-libxmlrpc_c.copyright.yml    |   6 +
 .../data/copyrights/libxt6-libxt.label.yml    |   5 +
 .../license_qpl_v1_0_perfect-QPL_v.0.yml      |   2 +
 ...inux_source_2_6-linux_source.copyright.yml |   2 +
 .../copyrights/logica_v1_0-Logica_v.0.yml     |   3 +
 .../data/copyrights/long_holder_name.txt.yml  |   3 +-
 .../data/copyrights/long_name.txt.yml         |   4 +-
 .../data/copyrights/luxi_fonts-Luxi_fonts.yml |   3 +
 tests/cluecode/data/copyrights/maia-Maia.yml  |   2 +
 .../cluecode/data/copyrights/man_page.txt.yml |   2 +
 tests/cluecode/data/copyrights/math.c.yml     |   6 +
 .../maven_pom_xstream-pom_xml.xml.yml         |   3 +
 .../mergesort_java-MergeSort_java.java.yml    |   2 +
 ...e_elf_hal_o_uu-mips_be_elf_hal_o_uu.uu.yml |   2 +
 .../data/copyrights/misco/allrisghts.txt.yml  |   2 +
 .../data/copyrights/misco/cali_1.txt.yml      |   2 +
 .../data/copyrights/misco/cip4.txt.yml        |   2 +
 .../data/copyrights/misco/codehaus.txt.yml    |   2 +
 .../data/copyrights/misco/french-1.txt.yml    |   2 +
 .../data/copyrights/misco/german-1.txt.yml    |   2 +
 .../misco/open-contributors.txt.yml           |   2 +
 .../data/copyrights/misco/w3c_1.txt.yml       |   2 +
 .../data/copyrights/misco2/antarctic.txt.yml  |   2 +
 .../data/copyrights/misco2/arizona.txt.yml    |   2 +
 .../data/copyrights/misco2/ayman.txt.yml      |   3 +
 .../data/copyrights/misco2/bsdnrl-BSDNRL.yml  |   2 +
 .../copyrights/misco2/chinese_char.txt.yml    |   2 +
 .../misco2/contributing-members.txt.yml       |   2 +
 .../misco2/copyrighted-by-colon.txt.yml       |   2 +
 .../misco2/copyrighted-complex.txt.yml        |   2 +
 .../copyrights/misco2/distributed_1.txt.yml   |   2 +
 .../copyrights/misco2/distributed_10.txt.yml  |   2 +
 .../copyrights/misco2/distributed_4.txt.yml   |   4 +
 .../copyrights/misco2/distributed_6.txt.yml   |   2 +
 .../copyrights/misco2/distributed_7.txt.yml   |   2 +
 .../copyrights/misco2/distributed_8.txt.yml   |   2 +
 .../copyrights/misco2/distributed_9.txt.yml   |   2 +
 .../copyrights/misco2/dtmf-contrib.txt.yml    |   2 +
 .../data/copyrights/misco2/email-name.txt.yml |   2 +
 .../data/copyrights/misco2/fiat.txt.yml       |   2 +
 .../copyrights/misco2/font-awesome.txt.yml    |   5 +
 .../copyrights/misco2/html_allright.txt.yml   |   2 +
 .../data/copyrights/misco2/jpnic.txt.yml      |   5 +
 .../data/copyrights/misco2/knowledge.txt.yml  |   4 +
 .../data/copyrights/misco2/myconame.txt.yml   |   2 +
 .../data/copyrights/misco2/nick.txt.yml       |   2 +
 .../data/copyrights/misco2/ocaml.txt.yml      |   2 +
 .../copyrights/misco2/opyright-baidu.txt.yml  |   2 +
 .../data/copyrights/misco2/osm.txt.yml        |   2 +
 .../data/copyrights/misco2/partners.txt.yml   |   2 +
 .../misco2/portion-copyright.txt.yml          |   2 +
 .../misco2/refinery-and-contribs.txt.yml      |   2 +
 .../misco2/regexhq/regexhq-002.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-003.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-005.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-008.txt.yml        |   6 +-
 .../misco2/regexhq/regexhq-012.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-013.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-017.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-020.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-022.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-023.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-024.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-028.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-031.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-041.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-042.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-043.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-044.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-046.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-103.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-104.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-114.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-115.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-127.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-135.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-145.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-148.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-150.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-151.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-159.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-160.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-162.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-170.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-175.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-177.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-178.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-179.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-185.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-186.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-190.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-197.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-212.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-220.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-222.txt.yml        |   2 +
 .../misco2/regexhq/regexhq-225.txt.yml        |   2 +
 .../misco2/regexhq/regexhq.ABOUT.yml          |   2 +
 .../data/copyrights/misco2/the-asf.txt.yml    |   2 +
 .../data/copyrights/misco2/w3c-ercim.txt.yml  |   2 +
 .../copyrights/misco2/w3c_complex.txt.yml     |   2 +
 .../misco3/apache-foundation.txt.yml          |   2 +
 .../misco3/distributed-copyright.txt.yml      |   3 +
 .../intractable-copyright-in-LICENSE.txt.yml  |   3 +
 .../intractable-copyright-in-LICENSE2.txt.yml |   3 +
 .../misco3/parens-with-spaces.txt.yml         |   2 +
 .../copyrights/misco4/as-represented.txt.yml  |   2 +
 .../misco4/initial-dev-again.txt.yml          |   2 +
 .../networking/arcnet-hardware.txt.yml        |   4 +-
 .../Documentation/s390/Debugging390.txt.yml   |   4 +
 .../arch/arm/kernel/sys_arm.c.yml             |   3 +
 .../arch/arm/mach-imx/mach-bug.c.yml          |   5 +
 .../arch/arm/mach-tegra/platsmp.c.yml         |   3 +
 .../arch/arm64/kernel/sys_compat.c.yml        |   4 +
 .../arch/microblaze/lib/fastcopy.S.yml        |   4 +
 .../powerpc/platforms/cell/spufs/Makefile.yml |   6 +-
 .../arch/um/drivers/daemon_kern.c.yml         |   4 +
 .../arch/um/drivers/daemon_user.c.yml         |   4 +
 .../arch/um/drivers/net_kern.c.yml            |   4 +
 .../arch/um/drivers/umcast_kern.c.yml         |   5 +
 .../drivers/ata/sata_mv.c.yml                 |   4 +
 .../drivers/gpu/drm/drm_agpsupport.c.yml      |   3 +
 .../drivers/hid/hid-appleir.c.yml             |   7 +
 .../media/usb/gspca/m5602/m5602_bridge.h.yml  |   5 +
 .../media/usb/gspca/m5602/m5602_core.c.yml    |   5 +
 .../media/usb/gspca/m5602/m5602_mt9m111.c.yml |   5 +
 .../media/usb/gspca/m5602/m5602_mt9m111.h.yml |   6 +
 .../media/usb/gspca/m5602/m5602_ov7660.c.yml  |   5 +
 .../media/usb/gspca/m5602/m5602_s5k83a.c.yml  |   5 +
 .../media/usb/gspca/m5602/m5602_s5k83a.h.yml  |   5 +
 .../media/usb/gspca/m5602/m5602_sensor.h.yml  |   5 +
 .../drivers/misc/mei/hw-txe-regs.h.yml        |   3 +
 .../drivers/net/can/sja1000/sja1000.c.yml     |   3 +
 .../drivers/net/can/sja1000/sja1000.h.yml     |   3 +
 .../drivers/net/ethernet/broadcom/tg3.h.yml   |   7 +
 .../net/ethernet/dec/tulip/de4x5.c.yml        |   2 +
 .../net/wireless/intel/ipw2x00/ipw2200.c.yml  |   5 +
 .../drivers/scsi/scsi_transport_fc.c.yml      |   3 +
 .../staging/rtl8723bs/hal/sdio_ops.c.yml      |   2 +
 .../halmac_8822b/halmac_api_8822b_sdio.c.yml  |   2 +
 .../halmac_8822b/halmac_api_8822b_usb.c.yml   |   2 +
 .../halmac/halmac_88xx/halmac_api_88xx.c.yml  |   2 +
 .../halmac_88xx/halmac_api_88xx_pcie.c.yml    |   2 +
 .../halmac_88xx/halmac_api_88xx_sdio.c.yml    |   2 +
 .../linux-copyrights/drivers/tty/n_tty.c.yml  |   4 +
 .../linux-copyrights/drivers/tty/nozomi.c.yml |   4 +
 .../drivers/usb/gadget/legacy/gmidi.c.yml     |   5 +
 .../linux-copyrights/fs/nilfs2/sufile.c.yml   |   2 +
 .../include/acpi/actbl3.h.yml                 |   4 +
 .../include/linux/pnfs_osd_xdr.h.yml          |   2 +
 .../include/scsi/scsi_transport_fc.h.yml      |   3 +
 .../include/uapi/linux/mic_common.h.yml       |   2 +
 .../include/uapi/linux/nbd.h.yml              |   4 +
 .../kernel/time/posix-timers.c.yml            |   3 +
 .../coccinelle/api/pm_runtime.cocci.yml       |   2 +
 .../sound/ppc/snd_ps3_reg.h.yml               |   4 +
 .../sound/soc/codecs/nau8825.c.yml            |   3 +
 .../testing/selftests/ntb/ntb_test.sh.yml     |   2 +
 .../copyrights/misco4/linux/dynamic.txt.yml   |   7 +
 .../data/copyrights/misco4/linux/irq.txt.yml  |   4 +
 .../misco4/linux4/multilines.txt.yml          |   2 +
 .../data/copyrights/misco4/linux4/nsa.txt.yml |   3 +
 .../copyrights/misco4/linux4/send.txt.yml     |   2 +
 .../data/copyrights/misco4/linux4/sgi.txt.yml |   2 +
 .../misco4/more-linux/misc-linux.txt.yml      |  23 +++
 .../copyrights/misco4/more-linux/octa.txt.yml |   2 +
 .../data/copyrights/misco4/nasa-copyright.yml |   2 +
 .../misco4/portions-initial-developer.txt.yml |   2 +
 .../data/copyrights/mit_danse-mojibake.yml    |   2 +
 tests/cluecode/data/copyrights/mit_danse.yml  |   2 +
 .../data/copyrights/mit_mlton-MIT_MLton.yml   |   3 +
 ...le_disclaimer4-MIT_OldStyle_disclaimer.yml |   2 +
 .../copyrights/mit_unicode-MIT_unicode.yml    |   2 +
 .../copyrights/mit_wordnet-MIT_WordNet.yml    |   2 +
 .../cluecode/data/copyrights/mitre-MITRE.yml  |   2 +
 .../data/copyrights/motorola_c-c.c.yml        |   2 +
 .../copyrights/motorola_mobility_c-c.c.yml    |   3 +
 .../cluecode/data/copyrights/msntp-MSNTP.yml  |   5 +
 .../copyrights/multiline-Historical.txt.yml   |   2 +
 .../copyrights/multiple_copyrights.cpp.yml    |   4 +
 .../data/copyrights/natural_docs.txt.yml      |   3 +
 .../data/copyrights/naumen-Naumen.yml         |   2 +
 .../data/copyrights/naumen_txt.txt.yml        |   2 +
 .../netcomponents-NetComponents.yml           |   2 +
 .../data/copyrights/nnp_and_co.txt.yml        |   2 +
 .../no_punctuation_after_holder_name.txt.yml  |   2 +
 .../cluecode/data/copyrights/nokia-Nokia.yml  |   2 +
 .../data/copyrights/nokia_cpp-cpp.cpp.yml     |   2 +
 .../notice_name_before_statement-NOTICE.yml   |   2 +
 .../data/copyrights/notice_txt-NOTICE.txt.yml |  13 ++
 .../data/copyrights/npl_v1_0-NPL_v.0.yml      |   2 +
 .../nvidia_source-Nvidia_source.yml           |   3 +
 .../data/copyrights/oclc_v1_0-OCLC_v.0.yml    |   3 +
 .../data/copyrights/oclc_v2_0-OCLC_v.0.yml    |   4 +
 .../data/copyrights/openldap-OpenLDAP.yml     |   2 +
 ...ffice_org_report_builder_bin.copyright.yml | 152 ++++++++++++++++++
 .../data/copyrights/openpbs-OpenPBS.yml       |   2 +
 .../openpublicationref-OpenPublicationref.yml |   2 +
 .../data/copyrights/openssl-OpenSSL.yml       |   2 +
 .../cluecode/data/copyrights/openssl-c.c.yml  |   3 +
 .../data/copyrights/opyrights.java.yml        |  10 ++
 tests/cluecode/data/copyrights/oracle.txt.yml |   2 +
 .../data/copyrights/osl_v3_0-OSL_v.0.yml      |   2 +
 .../data/copyrights/partial_detection.txt.yml |  16 ++
 .../copyrights/partial_detection_mit.txt.yml  |  16 ++
 .../perl_base-perl_base.copyright.yml         |  10 ++
 .../data/copyrights/phorum-Phorum.yml         |   2 +
 tests/cluecode/data/copyrights/pine-Pine.yml  |   2 +
 .../postgresql_8_3-postgresql.label.yml       |   5 +
 .../copyrights/present_year_range.txt.yml     |   2 +
 .../properties-properties.properties.yml      |   2 +
 .../psf_in_python-BitVector_py.py.yml         |   2 +
 ...hon_dateutil-python_dateutil.copyright.yml |   4 +
 .../copyrights/python_v1_6-Python_v.6.yml     |   2 +
 .../copyrights/python_v1_6_1-Python_v.1.yml   |   2 +
 .../data/copyrights/python_v2-Python_v.yml    |   3 +
 .../data/copyrights/qpl_v1_0-QPL_v.0.yml      |   2 +
 tests/cluecode/data/copyrights/rda.c.yml      |  22 +++
 .../copyrights/realpsl_v1_0-RealPSL_v.0.yml   |   2 +
 .../realpsl_v1_0ref-RealPSL_v_ref.0ref.yml    |   2 +
 .../reciprocal_v1_5-Reciprocal_v.5.yml        |   2 +
 ...ffice_org_report_builder_bin.copyright.yml |   3 +
 .../data/copyrights/redhatref-RedHatref.yml   |   4 +
 .../copyrights/regents_complex-strtol_c.c.yml |   2 +
 .../copyrights/regents_license-LICENSE.yml    |   5 +
 .../data/copyrights/ricoh_v1_0-Ricoh_v.0.yml  |   2 +
 tests/cluecode/data/copyrights/rim.txt.yml    |   2 +
 .../data/copyrights/s_fabsl_c-s_fabsl_c.c.yml |   2 +
 .../data/copyrights/sample_py-py.py.yml       |   4 +
 .../data/copyrights/scilab-Scilab.yml         |   7 +
 ...rse_plugins-seahorse_plugins.copyright.yml |  43 +++++
 .../copyrights/sgi_cid_v1_0-SGI_CID_v.0.yml   |   3 +
 .../copyrights/sgi_glx_v1_0-SGI_GLX_v.0.yml   |   2 +
 tests/cluecode/data/copyrights/sinica.txt.yml |   2 +
 .../data/copyrights/sleepycat-Sleepycat.yml   |   2 +
 .../somefile_cpp-somefile_cpp.cpp.yml         |   4 +
 .../lowercase_werken.txt.yml                  |   2 +
 .../statements_in_licenses/metastuff.txt.yml  |   2 +
 .../project_mayo.txt.yml                      |   2 +
 .../slash_in_name.txt.yml                     |   3 +
 .../data/copyrights/stmicro_in_h-h.h.yml      |   2 +
 .../data/copyrights/stmicro_in_txt.txt.yml    |   3 +
 .../data/copyrights/super_tech_c-c.c.yml      |   3 +
 ...seopenwatcom_v1_0-SybaseOpenWatcom_v.0.yml |   2 +
 .../data/copyrights/the_native_web.txt.yml    |   2 +
 ...oject_prop-ThirdPartyProject_prop.prop.yml |   2 +
 .../data/copyrights/toolchain.txt.yml         |   2 +
 .../data/copyrights/trailing_For-c.c.yml      |   3 +
 .../trailing_redistribution-bspatch_c.c.yml   |   3 +
 ...transfig_with_parts-transfig.copyright.yml |  18 +++
 ...r_java-TreeTableModelAdapter_java.java.yml |   2 +
 .../data/copyrights/unicode_translit.txt.yml  |   2 +
 tests/cluecode/data/copyrights/unicol.txt.yml |   2 +
 .../data/copyrights/unpublished.txt.yml       |   2 +
 .../data/copyrights/uofu_rfpl-UofU_RFPL.yml   |   2 +
 .../url_in_html-detail_9_html.html.yml        |   2 +
 .../utilities_js-utilities_js.js.yml          |   3 +
 .../data/copyrights/vitess_copyrights.txt.yml |   4 +
 .../copyrights/vovida_v1_0-Vovida_v.0.yml     |   2 +
 .../web_app_dtd_b_sun-web_app_dtd.dtd.yml     |   2 +
 ...eb_app_dtd_sun_twice-web_app_b_dtd.dtd.yml |   3 +
 .../data/copyrights/weird-date.java.yml       |   2 +
 tests/cluecode/data/copyrights/wide_c-c.c.yml |   2 +
 .../cluecode/data/copyrights/wide_txt.txt.yml |   2 +
 .../data/copyrights/with_ascii_art.txt.yml    |   2 +
 tests/cluecode/data/copyrights/with_colon.yml |   2 +
 .../with_dash_and_dotted_name.txt.yml         |   2 +
 ...with_leading_date_andtrailing_plus.txt.yml |   2 +
 .../with_sign_dash_and_dotted_name.txt.yml    |   2 +
 ..._year_noun_junk_auth_noun_and_auth.txt.yml |   2 +
 .../with_verbatim_lf-verbatim_lf_c.c.yml      |   2 +
 ..._year_noun_junk_auth_noun_and_auth.txt.yml |   2 +
 .../cluecode/data/copyrights/with_zoo.txt.yml |   2 +
 .../xfonts_utils-xfonts_utils.copyright.yml   |  17 ++
 .../copyrights/xresprobe-xresprobe.label.yml  |   7 +
 tests/cluecode/data/copyrights/zend-Zend.yml  |   2 +
 .../data/copyrights/zope_v1_0-Zope_v.0.yml    |   2 +
 .../data/copyrights/zope_v2_0-Zope_v.0.yml    |   2 +
 .../data/generated/copyright_10.txt.yml       |   2 +
 .../data/generated/copyright_11.txt.yml       |   2 +
 .../data/generated/copyright_12.txt.yml       |   2 +
 .../data/generated/copyright_14.txt.yml       |   2 +
 .../data/generated/copyright_15.txt.yml       |   2 +
 .../data/generated/copyright_16.txt.yml       |   2 +
 .../data/generated/copyright_17.txt.yml       |   2 +
 .../data/generated/copyright_18.txt.yml       |   2 +
 .../data/generated/copyright_19.txt.yml       |   2 +
 .../data/generated/copyright_2.txt.yml        |   2 +
 .../data/generated/copyright_20.txt.yml       |   2 +
 .../data/generated/copyright_21.txt.yml       |   2 +
 .../data/generated/copyright_23.txt.yml       |   2 +
 .../data/generated/copyright_25.txt.yml       |   2 +
 .../data/generated/copyright_26.txt.yml       |   2 +
 .../data/generated/copyright_29.txt.yml       |   2 +
 .../data/generated/copyright_3.txt.yml        |   2 +
 .../data/generated/copyright_31.txt.yml       |   2 +
 .../data/generated/copyright_32.txt.yml       |   2 +
 .../data/generated/copyright_33.txt.yml       |   2 +
 .../data/generated/copyright_34.txt.yml       |   2 +
 .../data/generated/copyright_35.txt.yml       |   2 +
 .../data/generated/copyright_36.txt.yml       |   2 +
 .../data/generated/copyright_38.txt.yml       |   2 +
 .../data/generated/copyright_41.txt.yml       |   2 +
 .../data/generated/copyright_45.txt.yml       |   2 +
 .../data/generated/copyright_46.txt.yml       |   3 +
 .../data/generated/copyright_47.txt.yml       |   2 +
 .../data/generated/copyright_48.txt.yml       |   2 +
 .../data/generated/copyright_51.txt.yml       |   2 +
 .../data/generated/copyright_52.txt.yml       |   3 +
 .../data/generated/copyright_6.txt.yml        |   2 +
 .../data/generated/copyright_7.txt.yml        |   2 +
 .../data/generated/copyright_9.txt.yml        |   2 +
 ...ld_detect_trailing_city_in_holders.txt.yml |   2 +
 .../data/holders/holder_acme_c-c.c.yml        |   2 +
 .../data/holders/holder_addr_c-addr_c.c.yml   |   3 +
 .../data/holders/holder_atheros_py-py.py.yml  |   4 +
 .../data/holders/holder_audio_c-c.c.yml       |   2 +
 .../data/holders/holder_basic-copy_c.c.yml    |  15 ++
 .../holders/holder_complex-strtol_c.c.yml     |   2 +
 .../holder_hans_jurgen_html-9_html.html.yml   |   2 +
 .../holder_hostpad-hostapd_cli_c.c.yml        |   3 +
 .../data/holders/holder_ibm_c-ibm_c.c.yml     |   7 +
 .../holders/holder_ifrename-ifrename_c.c.yml  |   2 +
 .../cluecode/data/holders/holder_in_c-c.c.yml |  11 ++
 ...in_copyright-COPYRIGHT_madwifi.madwifi.yml |   2 +
 .../data/holders/holder_in_h-ah_h.h.yml       |   2 +
 .../holder_in_license-COPYING_gpl.gpl.yml     |   3 +
 .../data/holders/holder_in_readme-README.yml  |   2 +
 .../data/holders/holder_in_text_.txt.yml      |  11 ++
 ...uencode_binary-mips_be_elf_hal_o_uu.uu.yml |   2 +
 .../holder_javascript-utilities_js.js.yml     |   3 +
 .../holder_javascript_large-ext_all_js.js.yml |   2 +
 ...der_mergesort_java-MergeSort_java.java.yml |   2 +
 .../holder_multiline-Historical.txt.yml       |   2 +
 .../data/holders/holder_nokia_cpp-cpp.cpp.yml |   2 +
 .../holders/holder_sample_java-java.java.yml  |   2 +
 .../data/holders/holder_simple-copy_c.c.yml   |   2 +
 .../holder_snmptrapd_c-snmptrapd_c.c.yml      |   2 +
 .../holder_somefile_cpp-somefile_cpp.cpp.yml  |   4 +
 ...lder_stacktrace_cpp-stacktrace_cpp.cpp.yml |   2 +
 .../data/holders/holder_super_c-c.c.yml       |   3 +
 ...r_java-TreeTableModelAdapter_java.java.yml |   2 +
 .../holders/holder_tunnel_h-tunnel_h.h.yml    |   2 +
 .../holder_var_route_c-var_route_c.c.yml      |   3 +
 .../data/holders/holder_xcon_sh-9_sh.sh.yml   |   2 +
 .../data/holders/holder_young_c-c.c.yml       |   3 +
 ...m_and_authors_are_detected_holders.txt.yml |   2 +
 .../data/holders/man_page_holders.txt.yml     |   2 +
 tests/cluecode/data/holders/oracle.txt.yml    |   2 +
 .../GeneratedMockJar.readme.yml               |   2 +
 .../regenerate_from_source.sh.yml             |   2 +
 .../ANTLRFileStream.java.yml                  |   2 +
 .../data/ics/apache-harmony/NOTICE.yml        |   5 +
 .../BinaryDecoder.java.yml                    |   2 +
 .../overview.html.yml                         |   2 +
 .../WeakHashtable.java.yml                    |   2 +
 .../LogFactory.java.yml                       |   2 +
 .../package.html.yml                          |   2 +
 .../apache-http/ThirdPartyProject.prop.yml    |   2 +
 .../XPathStylesheetDOM3Exception.java.yml     |   2 +
 tests/cluecode/data/ics/apache-xml/NOTICE.yml |  14 ++
 .../data/ics/astl-include/algorithm.yml       |   2 +
 .../data/ics/astl-include/basic_ios.h.yml     |   2 +
 .../data/ics/astl-include/streambuf.yml       |   2 +
 .../cluecode/data/ics/astl-include/string.yml |   2 +
 .../data/ics/astl-src/ostream.cpp.yml         |   2 +
 .../data/ics/astl-tests/test_vector.cpp.yml   |   2 +
 tests/cluecode/data/ics/astl/NOTICE.yml       |   2 +
 tests/cluecode/data/ics/blktrace/NOTICE.yml   |  12 ++
 .../data/ics/blktrace/btrace.spec.yml         |   2 +
 tests/cluecode/data/ics/blktrace/btrace.yml   |   2 +
 .../ics/bluetooth-bluez-health/mcap.c.yml     |   2 +
 .../ics/bluetooth-bluez-health/mcap.h.yml     |   3 +
 .../hciattach_qualcomm.c.yml                  |   3 +
 .../regex-syntax.sgml.yml                     |   2 +
 .../bluetooth-glib-gio-fam/fam-module.c.yml   |   3 +
 .../ics/bluetooth-glib-gio-fen/fen-data.c.yml |   2 +
 .../gfendirectorymonitor.c.yml                |   4 +
 .../bluetooth-glib-gobject/gobject.rc.in.yml  |   8 +-
 .../bluetooth-glib-gthread/gthread.rc.in.yml  |   3 +
 .../ics/bluetooth-glib-po/po2tbl.sed.in.yml   |   2 +
 tests/cluecode/data/ics/bsdiff/bsdiff.1.yml   |   2 +
 tests/cluecode/data/ics/bsdiff/bsdiff.c.yml   |   2 +
 tests/cluecode/data/ics/bzip2/LICENSE.yml     |   2 +
 tests/cluecode/data/ics/bzip2/bzip2.c.yml     |   3 +
 tests/cluecode/data/ics/bzip2/manual.html.yml |   3 +
 .../ics/chromium-android-jni/jni_utils.cc.yml |   2 +
 .../data/ics/chromium-android/execinfo.cc.yml |   2 +
 .../ics/chromium-app-sql/init_status.h.yml    |   2 +
 .../chromium-base-allocator/allocator.gyp.yml |   2 +
 .../icu_string_conversions.cc.yml             |   3 +
 .../LICENSE.yml                               |   2 +
 .../ThirdPartyProject.prop.yml                |   2 +
 .../dtoa.cc.yml                               |   2 +
 .../g_fmt.cc.yml                              |   2 +
 .../dynamic_annotations.c.yml                 |   2 +
 .../dynamic_annotations.gyp.yml               |   2 +
 .../icu_utf.cc.yml                            |   2 +
 .../icu_utf.h.yml                             |   2 +
 .../LICENSE.yml                               |   2 +
 .../prcpucfg.h.yml                            |   2 +
 .../prtime.cc.yml                             |   3 +
 .../atomicops_internals_x86_gcc.cc.yml        |   2 +
 .../atomicops_internals_x86_gcc.h.yml         |   2 +
 .../data/ics/chromium-base/base.gyp.yml       |   2 +
 .../ics/chromium-base/compat_execinfo.h.yml   |   2 +
 .../ics/chromium-base/file_version_info.h.yml |   2 +
 .../file_version_info_mac.mm.yml              |   2 +
 .../chromium-base/foundation_utils_mac.h.yml  |   2 +
 .../data/ics/chromium-base/md5.cc.yml         |   2 +
 .../ics/chromium-base/string_tokenizer.h.yml  |   2 +
 .../chromium-build-mac/strip_from_xcode.yml   |   2 +
 .../ics/chromium-build/branding_value.sh.yml  |   2 +
 .../chromium-build/install-build-deps.sh.yml  |   6 +
 .../chromium-build/whitespace_file.txt.yml    |   2 +
 .../panel_scroller_container.cc.yml           |   2 +
 .../authorization_util.mm.yml                 |   2 +
 .../download_extensions.cc.yml                |   3 +
 .../firefox_profile_lock.cc.yml               |   3 +
 .../firefox_profile_lock_posix.cc.yml         |   3 +
 .../firefox_profile_lock_win.cc.yml           |   3 +
 .../mork_reader.cc.yml                        |   2 +
 .../nss_decryptor.cc.yml                      |   3 +
 .../nss_decryptor_mac.h.yml                   |   3 +
 .../nss_decryptor_win.h.yml                   |   3 +
 .../system_metrics.proto.yml                  |   2 +
 .../render_widget_host_view_mac.mm.yml        |   4 +
 .../file_manager.css.yml                      |   2 +
 .../harness.html.yml                          |   2 +
 .../about_credits.html.yml                    | 104 ++++++++++++
 .../gpu_internals.html.yml                    |   2 +
 .../keyboard_overlay.js.yml                   |   2 +
 .../change_reorder_buffer.cc.yml              |   2 +
 .../clear_data_command.h.yml                  |   2 +
 .../advanced_tab_manipulation.applescript.yml |   2 +
 .../annotations.proto.yml                     |   2 +
 .../chrome.proto.yml                          |   2 +
 .../nacl_loader.sb.yml                        |   2 +
 .../background.html.yml                       |   2 +
 .../chrome_ex_oauthsimple.js.yml              |   3 +
 .../NOTICE.yml                                |   4 +
 .../blapi.h.yml                               |   2 +
 .../sha256.h.yml                              |   2 +
 .../chromium-googleurl-base/basictypes.h.yml  |   2 +
 .../chromium-googleurl-base/logging.cc.yml    |   2 +
 .../ics/chromium-googleurl-base/logging.h.yml |   2 +
 .../chromium-googleurl-base/scoped_ptr.h.yml  |   3 +
 .../gurl_unittest.cc.yml                      |   2 +
 .../url_canon_ip.cc.yml                       |   2 +
 .../chromium-googleurl-src/url_common.h.yml   |   2 +
 .../chromium-googleurl-src/url_parse.cc.yml   |   2 +
 .../url_test_utils.h.yml                      |   2 +
 .../ics/chromium-googleurl/LICENSE.txt.yml    |   3 +
 .../chromium-net-base/cookie_monster.cc.yml   |   3 +
 .../effective_tld_names.dat.yml               |   2 +
 .../ssl_false_start_blacklist_process.cc.yml  |   3 +
 .../x509_cert_types_mac_unittest.cc.yml       |   6 +
 .../x509_certificate_unittest.cc.yml          |   2 +
 .../no-ads.pac.yml                            |   2 +
 .../sparse_control.cc.yml                     |   2 +
 .../chromium-net-ftp/ftp_network_layer.cc.yml |   2 +
 .../data/ics/chromium-net-http/des.cc.yml     |   3 +
 .../http_auth_handler_ntlm_portable.cc.yml    |   3 +
 .../http_chunked_decoder.cc.yml               |   3 +
 .../data/ics/chromium-net-http/md4.cc.yml     |   2 +
 .../ssl_client_socket_nss.cc.yml              |   3 +
 .../chromiumsync.py.yml                       |   2 +
 .../tld_cleanup.cc.yml                        |   3 +
 .../gtest.cc.yml                              |   2 +
 .../gtest_main.cc.yml                         |   2 +
 .../codetablewriter_interface.h.yml           |   2 +
 .../gflags.cc.yml                             |   2 +
 .../chromium-sdch-open-vcdiff-src/mutex.h.yml |   2 +
 .../chromium-sdch-open-vcdiff-src/zconf.h.yml |   2 +
 .../gmock-cardinalities.h.yml                 |   2 +
 .../gmock_class_test.py.yml                   |   3 +
 .../gmock_gen.py.yml                          |   2 +
 .../fuse_gmock_files.py.yml                   |   2 +
 .../gmock_doctor.py.yml                       |   2 +
 .../gmock_test_utils.py.yml                   |   2 +
 .../ics/chromium-testing-gmock/COPYING.yml    |   2 +
 .../gtest-linked_ptr.h.yml                    |   2 +
 .../gtest-tuple.h.yml                         |   2 +
 .../sample10_unittest.cc.yml                  |   2 +
 .../gen_gtest_pred_impl.py.yml                |   4 +
 .../gtest-port.cc.yml                         |   2 +
 .../gtest-linked_ptr_test.cc.yml              |   2 +
 .../gtest_catch_exceptions_test.py.yml        |   2 +
 .../gtest_filter_unittest.py.yml              |   2 +
 .../gtest_shuffle_test.py.yml                 |   2 +
 .../generate_gmock_mutant.py.yml              |   3 +
 .../_libevent_time.h.yml                      |   2 +
 .../queue.h.yml                               |   2 +
 .../regress_dns.c.yml                         |   2 +
 .../buffer.c.yml                              |   2 +
 .../devpoll.c.yml                             |   2 +
 .../chromium-third_party-libevent/epoll.c.yml |   2 +
 .../epoll_sub.c.yml                           |   2 +
 .../evbuffer.c.yml                            |   2 +
 .../chromium-third_party-libevent/evdns.3.yml |   2 +
 .../chromium-third_party-libevent/evdns.h.yml |   2 +
 .../event-internal.h.yml                      |   2 +
 .../chromium-third_party-libevent/event.3.yml |   2 +
 .../chromium-third_party-libevent/event.h.yml |   2 +
 .../event_rpcgen.py.yml                       |   2 +
 .../event_tagging.c.yml                       |   2 +
 .../evport.c.yml                              |   2 +
 .../evsignal.h.yml                            |   2 +
 .../evutil.c.yml                              |   2 +
 .../http-internal.h.yml                       |   2 +
 .../chromium-third_party-libevent/http.c.yml  |   2 +
 .../chromium-third_party-libevent/log.c.yml   |   4 +
 .../min_heap.h.yml                            |   2 +
 .../strlcpy.c.yml                             |   2 +
 .../httpbase.cc.yml                           |   3 +
 .../COPYING.yml                               |   2 +
 .../chromium-third_party-modp_b64/LICENSE.yml |   2 +
 .../modp_b64.cc.yml                           |   2 +
 .../modp_b64.h.yml                            |   2 +
 .../README.txt.yml                            |   3 +
 .../inspector_strings.grd.yml                 |   2 +
 .../multipart_response_delegate.h.yml         |   3 +
 .../webkit_strings.grd.yml                    |   3 +
 tests/cluecode/data/ics/chromium/LICENSE.yml  |   2 +
 tests/cluecode/data/ics/clang/NOTICE.yml      |   2 +
 .../data/ics/dbus-dbus/dbus-hash.c.yml        |   7 +
 .../data/ics/dbus-dbus/dbus-md5.c.yml         |   3 +
 .../data/ics/dbus-doc/introspect.xsl.yml      |   2 +
 .../data/ics/dbus-tools/strtoll.c.yml         |   2 +
 tests/cluecode/data/ics/dbus/COPYING.yml      |   4 +
 .../data/ics/dhcpcd-compat/linkaddr.c.yml     |   2 +
 tests/cluecode/data/ics/dhcpcd/NOTICE.yml     |   4 +
 tests/cluecode/data/ics/dhcpcd/arp.c.yml      |   2 +
 tests/cluecode/data/ics/dhcpcd/bind.c.yml     |   2 +
 tests/cluecode/data/ics/dhcpcd/client.c.yml   |   2 +
 tests/cluecode/data/ics/dhcpcd/common.c.yml   |   2 +
 tests/cluecode/data/ics/dhcpcd/dhcpcd.8.yml   |   2 +
 tests/cluecode/data/ics/dhcpcd/dhcpcd.c.yml   |   3 +
 .../data/ics/dhcpcd/if-linux-wireless.c.yml   |   2 +
 .../data/ics/dnsmasq-src/nameser.h.yml        |   4 +
 .../Java.g.yml                                |   2 +
 .../ics/dropbear-libtommath-mtest/mpi.c.yml   |   2 +
 .../ics/dropbear-libtommath-mtest/mpi.h.yml   |   2 +
 tests/cluecode/data/ics/dropbear/LICENSE.yml  |   8 +
 .../cluecode/data/ics/dropbear/agentfwd.h.yml |   2 +
 .../cluecode/data/ics/dropbear/atomicio.c.yml |   2 +
 .../data/ics/dropbear/circbuffer.c.yml        |   2 +
 .../cluecode/data/ics/dropbear/cli-algo.c.yml |   3 +
 .../data/ics/dropbear/cli-authinteract.c.yml  |   2 +
 .../cluecode/data/ics/dropbear/cli-kex.c.yml  |   3 +
 .../data/ics/dropbear/common-kex.c.yml        |   3 +
 tests/cluecode/data/ics/dropbear/compat.c.yml |   4 +
 tests/cluecode/data/ics/dropbear/dbutil.c.yml |   3 +
 .../data/ics/dropbear/fake-rfc2553.c.yml      |   3 +
 .../data/ics/dropbear/keyimport.c.yml         |   4 +
 .../cluecode/data/ics/dropbear/loginrec.c.yml |   5 +
 .../cluecode/data/ics/dropbear/loginrec.h.yml |   2 +
 .../data/ics/dropbear/netbsd_getpass.c.yml    |   2 +
 .../data/ics/dropbear/progressmeter.c.yml     |   2 +
 .../data/ics/dropbear/progressmeter.h.yml     |   2 +
 tests/cluecode/data/ics/dropbear/scp.c.yml    |   4 +
 .../cluecode/data/ics/dropbear/scpmisc.c.yml  |   3 +
 .../cluecode/data/ics/dropbear/scpmisc.h.yml  |   2 +
 .../data/ics/dropbear/svr-authpam.c.yml       |   3 +
 .../cluecode/data/ics/dropbear/svr-main.c.yml |   2 +
 .../ANTMain.java.yml                          |   3 +
 .../emmajavaTask.java.yml                     |   3 +
 .../IMetadataConstants.java.yml               |   2 +
 .../ReportGenerator.java.yml                  |   5 +
 .../IAppConstants.java.yml                    |   4 +
 .../Processor.java.yml                        |   3 +
 .../AbstractClassDefVisitor.java.yml          |   3 +
 .../ConstantCollection.java.yml               |   3 +
 .../ILogLevels.java.yml                       |   3 +
 .../SoftValueMap.java.yml                     |   3 +
 .../WCMatcher.java.yml                        |   3 +
 tests/cluecode/data/ics/emma/BUILD.txt.yml    |   2 +
 tests/cluecode/data/ics/emma/test.sh.yml      |   2 +
 .../data/ics/expat-amiga/expat_lib.c.yml      |   2 +
 .../data/ics/expat-conftools/ltmain.sh.yml    |   7 +-
 .../data/ics/expat-doc/reference.html.yml     |   2 +
 .../data/ics/expat-examples/outline.c.yml     |   2 +
 .../data/ics/expat-lib/macconfig.h.yml        |   2 +
 tests/cluecode/data/ics/expat/NOTICE.yml      |   3 +
 tests/cluecode/data/ics/fdlibm/NOTICE.yml     |   2 +
 tests/cluecode/data/ics/fdlibm/e_acos.c.yml   |   2 +
 tests/cluecode/data/ics/fdlibm/e_exp.c.yml    |   2 +
 tests/cluecode/data/ics/fdlibm/k_tan.c.yml    |   2 +
 .../cluecode/data/ics/fdlibm/makefile.in.yml  |   2 +
 .../data/ics/freetype-builds/ft2unix.h.yml    |   2 +
 .../ftconfig.h.yml                            |   2 +
 .../ftstdlib.h.yml                            |   2 +
 .../svbdf.h.yml                               |   2 +
 .../svcid.h.yml                               |   2 +
 .../svgxval.h.yml                             |   2 +
 .../svkern.h.yml                              |   2 +
 .../svmm.h.yml                                |   2 +
 .../svpostnm.h.yml                            |   2 +
 .../svpsinfo.h.yml                            |   2 +
 .../svttcmap.h.yml                            |   3 +
 .../svttglyf.h.yml                            |   2 +
 .../autohint.h.yml                            |   2 +
 .../ftcalc.h.yml                              |   2 +
 .../ftdebug.h.yml                             |   2 +
 .../ftdriver.h.yml                            |   2 +
 .../ftobjs.h.yml                              |   2 +
 .../ftpic.h.yml                               |   2 +
 .../ftserv.h.yml                              |   2 +
 .../ftstream.h.yml                            |   2 +
 .../fttrace.h.yml                             |   2 +
 .../ftvalid.h.yml                             |   2 +
 .../internal.h.yml                            |   2 +
 .../pshints.h.yml                             |   2 +
 .../sfnt.h.yml                                |   2 +
 .../tttypes.h.yml                             |   2 +
 .../freetype-include-freetype/freetype.h.yml  |   2 +
 .../freetype-include-freetype/ftadvanc.h.yml  |   2 +
 .../freetype-include-freetype/ftbbox.h.yml    |   2 +
 .../ics/freetype-include-freetype/ftbdf.h.yml |   2 +
 .../freetype-include-freetype/ftbitmap.h.yml  |   2 +
 .../freetype-include-freetype/ftcache.h.yml   |   2 +
 .../ics/freetype-include-freetype/ftcid.h.yml |   2 +
 .../freetype-include-freetype/fterrdef.h.yml  |   2 +
 .../freetype-include-freetype/fterrors.h.yml  |   2 +
 .../freetype-include-freetype/ftgasp.h.yml    |   2 +
 .../freetype-include-freetype/ftglyph.h.yml   |   2 +
 .../freetype-include-freetype/ftgxval.h.yml   |   2 +
 .../freetype-include-freetype/ftgzip.h.yml    |   2 +
 .../freetype-include-freetype/ftimage.h.yml   |   2 +
 .../freetype-include-freetype/ftincrem.h.yml  |   2 +
 .../freetype-include-freetype/ftlcdfil.h.yml  |   2 +
 .../freetype-include-freetype/ftlist.h.yml    |   2 +
 .../ics/freetype-include-freetype/ftlzw.h.yml |   2 +
 .../ics/freetype-include-freetype/ftmac.h.yml |   2 +
 .../ics/freetype-include-freetype/ftmm.h.yml  |   2 +
 .../freetype-include-freetype/ftmodapi.h.yml  |   2 +
 .../freetype-include-freetype/ftmoderr.h.yml  |   2 +
 .../freetype-include-freetype/ftotval.h.yml   |   2 +
 .../freetype-include-freetype/ftoutln.h.yml   |   2 +
 .../ics/freetype-include-freetype/ftpfr.h.yml |   2 +
 .../freetype-include-freetype/ftrender.h.yml  |   2 +
 .../freetype-include-freetype/ftsnames.h.yml  |   2 +
 .../freetype-include-freetype/ftstroke.h.yml  |   2 +
 .../freetype-include-freetype/ftsynth.h.yml   |   2 +
 .../freetype-include-freetype/ftsystem.h.yml  |   2 +
 .../freetype-include-freetype/fttrigon.h.yml  |   2 +
 .../freetype-include-freetype/fttypes.h.yml   |   2 +
 .../freetype-include-freetype/ftwinfnt.h.yml  |   2 +
 .../freetype-include-freetype/ftxf86.h.yml    |   2 +
 .../freetype-include-freetype/t1tables.h.yml  |   2 +
 .../freetype-include-freetype/ttnameid.h.yml  |   2 +
 .../freetype-include-freetype/tttables.h.yml  |   2 +
 .../freetype-include-freetype/tttags.h.yml    |   2 +
 .../freetype-include-freetype/ttunpat.h.yml   |   2 +
 .../data/ics/freetype-include/ft2build.h.yml  |   2 +
 .../ics/freetype-src-autofit/afangles.c.yml   |   2 +
 .../data/ics/freetype-src-autofit/afcjk.c.yml |   2 +
 .../data/ics/freetype-src-autofit/afcjk.h.yml |   2 +
 .../ics/freetype-src-autofit/afdummy.c.yml    |   2 +
 .../ics/freetype-src-autofit/aferrors.h.yml   |   2 +
 .../ics/freetype-src-autofit/afglobal.c.yml   |   2 +
 .../ics/freetype-src-autofit/afglobal.h.yml   |   2 +
 .../ics/freetype-src-autofit/afhints.c.yml    |   2 +
 .../ics/freetype-src-autofit/afhints.h.yml    |   2 +
 .../ics/freetype-src-autofit/aflatin.h.yml    |   2 +
 .../ics/freetype-src-autofit/afloader.c.yml   |   2 +
 .../ics/freetype-src-autofit/afmodule.c.yml   |   2 +
 .../ics/freetype-src-autofit/afmodule.h.yml   |   2 +
 .../data/ics/freetype-src-autofit/afpic.c.yml |   2 +
 .../data/ics/freetype-src-autofit/afpic.h.yml |   2 +
 .../ics/freetype-src-autofit/afwarp.h.yml     |   2 +
 .../ics/freetype-src-autofit/autofit.c.yml    |   2 +
 .../data/ics/freetype-src-base/ftadvanc.c.yml |   2 +
 .../data/ics/freetype-src-base/ftapi.c.yml    |   2 +
 .../data/ics/freetype-src-base/ftbase.c.yml   |   2 +
 .../data/ics/freetype-src-base/ftbase.h.yml   |   2 +
 .../data/ics/freetype-src-base/ftbbox.c.yml   |   2 +
 .../data/ics/freetype-src-base/ftbitmap.c.yml |   2 +
 .../data/ics/freetype-src-base/ftcalc.c.yml   |   2 +
 .../data/ics/freetype-src-base/ftdbgmem.c.yml |   2 +
 .../data/ics/freetype-src-base/ftdebug.c.yml  |   2 +
 .../data/ics/freetype-src-base/ftglyph.c.yml  |   2 +
 .../data/ics/freetype-src-base/ftinit.c.yml   |   2 +
 .../data/ics/freetype-src-base/ftlcdfil.c.yml |   2 +
 .../data/ics/freetype-src-base/ftmm.c.yml     |   2 +
 .../data/ics/freetype-src-base/ftobjs.c.yml   |   2 +
 .../data/ics/freetype-src-base/ftpatent.c.yml |   2 +
 .../data/ics/freetype-src-base/ftsnames.c.yml |   2 +
 .../data/ics/freetype-src-base/ftstream.c.yml |   2 +
 .../data/ics/freetype-src-base/ftstroke.c.yml |   2 +
 .../data/ics/freetype-src-base/ftsynth.c.yml  |   2 +
 .../data/ics/freetype-src-base/ftsystem.c.yml |   2 +
 .../data/ics/freetype-src-base/fttrigon.c.yml |   2 +
 .../data/ics/freetype-src-base/ftutil.c.yml   |   2 +
 .../data/ics/freetype-src-base/ftxf86.c.yml   |   2 +
 .../data/ics/freetype-src-cff/cff.c.yml       |   2 +
 .../data/ics/freetype-src-cff/cffcmap.c.yml   |   2 +
 .../data/ics/freetype-src-cff/cffcmap.h.yml   |   2 +
 .../data/ics/freetype-src-cff/cfferrs.h.yml   |   2 +
 .../data/ics/freetype-src-cff/cffload.c.yml   |   2 +
 .../data/ics/freetype-src-cff/cffload.h.yml   |   2 +
 .../data/ics/freetype-src-cff/cffobjs.h.yml   |   2 +
 .../data/ics/freetype-src-cff/cffparse.c.yml  |   2 +
 .../data/ics/freetype-src-cff/cffparse.h.yml  |   2 +
 .../data/ics/freetype-src-cff/cffpic.c.yml    |   2 +
 .../data/ics/freetype-src-cff/cfftypes.h.yml  |   2 +
 .../ics/freetype-src-psaux/afmparse.c.yml     |   2 +
 .../data/ics/freetype-src-psaux/psaux.c.yml   |   2 +
 .../ics/freetype-src-psaux/psauxmod.c.yml     |   2 +
 .../ics/freetype-src-psaux/psauxmod.h.yml     |   2 +
 .../data/ics/freetype-src-psaux/psconv.c.yml  |   2 +
 .../data/ics/freetype-src-psaux/t1cmap.c.yml  |   2 +
 .../ics/freetype-src-psaux/t1decode.c.yml     |   2 +
 .../ics/freetype-src-psaux/t1decode.h.yml     |   2 +
 .../ics/freetype-src-pshinter/pshalgo.c.yml   |   2 +
 .../ics/freetype-src-pshinter/pshalgo.h.yml   |   2 +
 .../ics/freetype-src-pshinter/pshglob.c.yml   |   2 +
 .../ics/freetype-src-pshinter/pshglob.h.yml   |   2 +
 .../ics/freetype-src-pshinter/pshinter.c.yml  |   2 +
 .../ics/freetype-src-pshinter/pshmod.c.yml    |   2 +
 .../ics/freetype-src-pshinter/pshrec.c.yml    |   2 +
 .../ics/freetype-src-pshinter/pshrec.h.yml    |   2 +
 .../ics/freetype-src-psnames/psmodule.c.yml   |   2 +
 .../ics/freetype-src-psnames/psmodule.h.yml   |   2 +
 .../ics/freetype-src-psnames/pstables.h.yml   |   2 +
 .../data/ics/freetype-src-raster/ftmisc.h.yml |   2 +
 .../ics/freetype-src-raster/ftraster.c.yml    |   2 +
 .../ics/freetype-src-raster/ftrend1.c.yml     |   2 +
 .../data/ics/freetype-src-sfnt/sfdriver.c.yml |   2 +
 .../data/ics/freetype-src-sfnt/sferrors.h.yml |   2 +
 .../data/ics/freetype-src-sfnt/sfobjs.c.yml   |   2 +
 .../data/ics/freetype-src-sfnt/ttbdf.c.yml    |   2 +
 .../data/ics/freetype-src-sfnt/ttcmap.c.yml   |   2 +
 .../data/ics/freetype-src-sfnt/ttcmap.h.yml   |   2 +
 .../data/ics/freetype-src-sfnt/ttkern.c.yml   |   2 +
 .../data/ics/freetype-src-sfnt/ttkern.h.yml   |   2 +
 .../data/ics/freetype-src-sfnt/ttload.h.yml   |   2 +
 .../data/ics/freetype-src-sfnt/ttmtx.c.yml    |   2 +
 .../data/ics/freetype-src-sfnt/ttpost.c.yml   |   2 +
 .../data/ics/freetype-src-sfnt/ttsbit.h.yml   |   2 +
 .../data/ics/freetype-src-sfnt/ttsbit0.c.yml  |   2 +
 .../ics/freetype-src-smooth/ftgrays.c.yml     |   2 +
 .../ics/freetype-src-smooth/ftsmooth.c.yml    |   2 +
 .../ics/freetype-src-truetype/truetype.c.yml  |   2 +
 .../ics/freetype-src-truetype/ttgload.c.yml   |   2 +
 .../ics/freetype-src-truetype/ttgload.h.yml   |   2 +
 .../ics/freetype-src-truetype/ttinterp.h.yml  |   2 +
 .../ics/freetype-src-truetype/ttobjs.h.yml    |   2 +
 .../ics/freetype-src-truetype/ttpload.c.yml   |   2 +
 tests/cluecode/data/ics/freetype/NOTICE.yml   |   4 +
 .../gtest-test/gtest_filter_unittest.py.yml   |   2 +
 .../data/ics/gtest-test/gtest_nc_test.py.yml  |   2 +
 .../harfbuzz-unicode-icu.c.yml                |   3 +
 .../tc_skbedit.h.yml                          |   2 +
 .../iproute2-include-linux/if_addrlabel.h.yml |   2 +
 .../ipsec-tools-src-include-glibc/NOTICE.yml  |   2 +
 .../ics/ipsec-tools-src-libipsec/NOTICE.yml   |   3 +
 .../ipsec_dump_policy.c.yml                   |   2 +
 .../ipsec_set_policy.3.yml                    |   2 +
 .../ipsec-tools-src-libipsec/key_debug.c.yml  |   2 +
 .../policy_parse.y.yml                        |   2 +
 .../sha2.c.yml                                |   2 +
 .../sha2.h.yml                                |   2 +
 .../ics/ipsec-tools-src-racoon/NOTICE.yml     |  13 ++
 .../ics/ipsec-tools-src-racoon/cfparse.y.yml  |   2 +
 .../ics/ipsec-tools-src-racoon/dump.h.yml     |   2 +
 .../data/ics/ipsec-tools-src-racoon/evt.c.yml |   3 +
 .../ics/ipsec-tools-src-racoon/gcmalloc.h.yml |   2 +
 .../ics/ipsec-tools-src-racoon/genlist.c.yml  |   2 +
 .../ipsec-tools-src-racoon/grabmyaddr.c.yml   |   3 +
 .../ics/ipsec-tools-src-racoon/gssapi.c.yml   |   2 +
 .../ics/ipsec-tools-src-racoon/handler.h.yml  |   2 +
 .../ipsec-tools-src-racoon/isakmp_cfg.c.yml   |   2 +
 .../ipsec-tools-src-racoon/isakmp_cfg.h.yml   |   2 +
 .../ipsec-tools-src-racoon/isakmp_xauth.c.yml |   2 +
 .../ipsec-tools-src-racoon/plainrsa-gen.8.yml |   2 +
 .../ics/ipsec-tools-src-racoon/racoon.8.yml   |   2 +
 .../ipsec-tools-src-racoon/racoonctl.8.yml    |   2 +
 .../ipsec-tools-src-racoon/racoonctl.c.yml    |   3 +
 .../ics/ipsec-tools-src-racoon/security.c.yml |   3 +
 .../cluecode/data/ics/ipsec-tools/NOTICE.yml  |  16 ++
 .../iptables-extensions/libxt_IDLETIMER.c.yml |   2 +
 .../ics/iptables-extensions/libxt_TEE.c.yml   |   2 +
 .../iptables-extensions/libxt_conntrack.c.yml |   3 +
 .../xt_conntrack.h.yml                        |   2 +
 .../iptables-iptables/iptables-apply.8.yml    |   2 +
 .../iptables-libipq/ipq_create_handle.3.yml   |   3 +
 .../data/ics/iptables-libipq/ipq_errstr.3.yml |   3 +
 .../Assistant.java.yml                        |   2 +
 .../Annotation.java.yml                       |   2 +
 .../NoSuchClassError.java.yml                 |   2 +
 .../ByteStream.java.yml                       |   2 +
 .../InstructionPrinter.java.yml               |   2 +
 .../ByteArrayClassPath.java.yml               |   2 +
 .../CtClass.java.yml                          |   3 +
 .../ics/javassist-tutorial/tutorial.html.yml  |   2 +
 .../data/ics/javassist/License.html.yml       |   2 +
 tests/cluecode/data/ics/javassist/NOTICE.yml  |   2 +
 .../data/ics/javassist/Readme.html.yml        |   4 +
 tests/cluecode/data/ics/jhead/main.c.yml      |   2 +
 tests/cluecode/data/ics/jpeg/NOTICE.yml       |   2 +
 tests/cluecode/data/ics/jpeg/README.yml       |   6 +
 tests/cluecode/data/ics/jpeg/ansi2knr.c.yml   |   3 +
 tests/cluecode/data/ics/jpeg/cderror.h.yml    |   2 +
 tests/cluecode/data/ics/jpeg/cdjpeg.c.yml     |   2 +
 tests/cluecode/data/ics/jpeg/cjpeg.c.yml      |   2 +
 tests/cluecode/data/ics/jpeg/ckconfig.c.yml   |   2 +
 .../cluecode/data/ics/jpeg/coderules.doc.yml  |   2 +
 tests/cluecode/data/ics/jpeg/filelist.doc.yml |   2 +
 tests/cluecode/data/ics/jpeg/install.doc.yml  |   2 +
 tests/cluecode/data/ics/jpeg/jcapimin.c.yml   |   2 +
 tests/cluecode/data/ics/jpeg/jcapistd.c.yml   |   2 +
 tests/cluecode/data/ics/jpeg/jccolor.c.yml    |   2 +
 tests/cluecode/data/ics/jpeg/jcphuff.c.yml    |   2 +
 tests/cluecode/data/ics/jpeg/jctrans.c.yml    |   2 +
 tests/cluecode/data/ics/jpeg/jmemansi.c.yml   |   2 +
 tests/cluecode/data/ics/jpeg/jmemdos.c.yml    |   2 +
 tests/cluecode/data/ics/jpeg/jversion.h.yml   |   3 +
 tests/cluecode/data/ics/jpeg/rdcolmap.c.yml   |   3 +
 tests/cluecode/data/ics/jpeg/rdppm.c.yml      |   3 +
 .../cluecode/data/ics/jpeg/structure.doc.yml  |   2 +
 tests/cluecode/data/ics/jpeg/transupp.c.yml   |   2 +
 tests/cluecode/data/ics/jpeg/wrgif.c.yml      |   4 +
 tests/cluecode/data/ics/jpeg/wrjpgcom.c.yml   |   2 +
 tests/cluecode/data/ics/jsr305/NOTICE.yml     |   2 +
 .../vmalloc.h.yml                             |   2 +
 .../atomic.h.yml                              |   3 +
 .../bitops.h.yml                              |   3 +
 .../domain.h.yml                              |   2 +
 .../posix_types.h.yml                         |   2 +
 .../sizes.h.yml                               |   2 +
 .../thread_info.h.yml                         |   2 +
 .../tlb.h.yml                                 |   3 +
 .../bitops_32.h.yml                           |   2 +
 .../genapic_32.h.yml                          |   2 +
 .../flashchip.h.yml                           |   2 +
 .../gss_asn1.h.yml                            |   3 +
 .../gss_err.h.yml                             |   3 +
 .../kernel-headers-original-linux/a1026.h.yml |   2 +
 .../aio_abi.h.yml                             |   2 +
 .../kernel-headers-original-linux/ata.h.yml   |   3 +
 .../kernel-headers-original-linux/clk.h.yml   |   2 +
 .../kernel-headers-original-linux/coda.h.yml  |   3 +
 .../dm-ioctl.h.yml                            |   3 +
 .../dmaengine.h.yml                           |   2 +
 .../kernel-headers-original-linux/ftape.h.yml |   3 +
 .../kernel-headers-original-linux/hil.h.yml   |   2 +
 .../if_ppp.h.yml                              |   2 +
 .../kernel-headers-original-linux/jbd.h.yml   |   2 +
 .../kernel-headers-original-linux/kxtf9.h.yml |   2 +
 .../leds-an30259a.h.yml                       |   2 +
 .../lis331dlh.h.yml                           |   2 +
 .../kernel-headers-original-linux/loop.h.yml  |   2 +
 .../msm_q6vdec.h.yml                          |   2 +
 .../msm_vidc_dec.h.yml                        |   2 +
 .../msm_vidc_enc.h.yml                        |   2 +
 .../mt9t013.h.yml                             |   2 +
 .../kernel-headers-original-linux/nfs4.h.yml  |   2 +
 .../nvhdcp.h.yml                              |   2 +
 .../ppp_defs.h.yml                            |   2 +
 .../qic117.h.yml                              |   3 +
 .../kernel-headers-original-linux/quota.h.yml |   2 +
 .../rpmsg_omx.h.yml                           |   2 +
 .../serial_reg.h.yml                          |   2 +
 .../wireless.h.yml                            |   2 +
 .../kernel-headers-original-linux/xattr.h.yml |   4 +
 .../kernel-headers-original-linux/zconf.h.yml |   2 +
 .../data/ics/libffi-src-m32r/ffitarget.h.yml  |   2 +
 tests/cluecode/data/ics/libffi/LICENSE.yml    |   2 +
 .../cluecode/data/ics/libgsm-inc/config.h.yml |   2 +
 tests/cluecode/data/ics/libgsm-man/gsm.3.yml  |   2 +
 .../data/ics/libgsm-man/gsm_option.3.yml      |   2 +
 tests/cluecode/data/ics/libgsm/ChangeLog.yml  |   2 +
 tests/cluecode/data/ics/libgsm/README.yml     |   2 +
 .../data/ics/libpcap-doc/pcap.html.yml        |   3 +
 .../data/ics/libpcap-doc/pcap.txt.yml         |   3 +
 .../data/ics/libpcap-lbl/os-sunos4.h.yml      |   2 +
 .../data/ics/libpcap-lbl/os-ultrix4.h.yml     |   2 +
 .../data/ics/libpcap-missing/snprintf.c.yml   |   2 +
 .../cluecode/data/ics/libpcap/Makefile.in.yml |   2 +
 .../cluecode/data/ics/libpcap/aclocal.m4.yml  |   2 +
 .../cluecode/data/ics/libpcap/atmuni31.h.yml  |   2 +
 .../cluecode/data/ics/libpcap/bpf_dump.c.yml  |   2 +
 .../cluecode/data/ics/libpcap/bpf_image.c.yml |   2 +
 .../data/ics/libpcap/configure.in.yml         |   2 +
 .../cluecode/data/ics/libpcap/etherent.c.yml  |   2 +
 .../cluecode/data/ics/libpcap/ethertype.h.yml |   2 +
 .../cluecode/data/ics/libpcap/fad-getad.c.yml |   2 +
 .../cluecode/data/ics/libpcap/fad-win32.c.yml |   3 +
 tests/cluecode/data/ics/libpcap/gencode.c.yml |   2 +
 tests/cluecode/data/ics/libpcap/gencode.h.yml |   3 +
 tests/cluecode/data/ics/libpcap/grammar.c.yml |   3 +
 tests/cluecode/data/ics/libpcap/llc.h.yml     |   2 +
 tests/cluecode/data/ics/libpcap/mkdep.yml     |   2 +
 tests/cluecode/data/ics/libpcap/nlpid.h.yml   |   2 +
 .../cluecode/data/ics/libpcap/optimize.c.yml  |   2 +
 .../cluecode/data/ics/libpcap/pcap-bpf.c.yml  |   2 +
 .../cluecode/data/ics/libpcap/pcap-bpf.h.yml  |   2 +
 .../cluecode/data/ics/libpcap/pcap-dlpi.c.yml |   2 +
 .../cluecode/data/ics/libpcap/pcap-int.h.yml  |   2 +
 .../data/ics/libpcap/pcap-namedb.h.yml        |   2 +
 .../cluecode/data/ics/libpcap/pcap-nit.c.yml  |   2 +
 .../cluecode/data/ics/libpcap/pcap-nit.h.yml  |   2 +
 .../cluecode/data/ics/libpcap/pcap-null.c.yml |   2 +
 .../data/ics/libpcap/pcap-stdinc.h.yml        |   2 +
 .../data/ics/libpcap/pcap-win32.c.yml         |   3 +
 tests/cluecode/data/ics/libpcap/pcap.3.yml    |   2 +
 tests/cluecode/data/ics/libpcap/pcap.c.yml    |   2 +
 tests/cluecode/data/ics/libpcap/pcap.h.yml    |   2 +
 tests/cluecode/data/ics/libpcap/ppp.h.yml     |   2 +
 tests/cluecode/data/ics/libpcap/scanner.c.yml |   2 +
 .../obj_int_extract.bat.yml                   |   2 +
 .../Toc.pod.yml                               |   2 +
 .../License.text.yml                          |   3 +
 .../PHP_Markdown_Extra_Readme.text.yml        |   3 +
 .../markdown.php.yml                          |   5 +
 .../PHP_SmartyPants_Readme.txt.yml            |   3 +
 .../smartypants.php.yml                       |   5 +
 .../data/ics/libvpx-libmkv/EbmlIDs.h.yml      |   2 +
 .../libvpx-nestegg-halloc-src/halloc.c.yml    |   2 +
 .../data/ics/libvpx-nestegg-halloc/README.yml |   2 +
 .../ics/libvpx-nestegg-halloc/halloc.h.yml    |   2 +
 .../libvpx-vp8-common/asm_com_offsets.c.yml   |   2 +
 tests/cluecode/data/ics/libvpx/LICENSE.yml    |   2 +
 tests/cluecode/data/ics/libvpx/args.c.yml     |   2 +
 tests/cluecode/data/ics/libvpx/docs.mk.yml    |   2 +
 tests/cluecode/data/ics/libvpx/y4minput.c.yml |   3 +
 tests/cluecode/data/ics/libxml2/NOTICE.yml    |   2 +
 tests/cluecode/data/ics/libxml2/dict.c.yml    |   2 +
 tests/cluecode/data/ics/libxml2/hash.c.yml    |   2 +
 tests/cluecode/data/ics/libxml2/list.c.yml    |   2 +
 tests/cluecode/data/ics/libxml2/trio.c.yml    |   2 +
 tests/cluecode/data/ics/libxml2/triop.h.yml   |   2 +
 tests/cluecode/data/ics/libxml2/triostr.c.yml |   2 +
 tests/cluecode/data/ics/libxslt/Copyright.yml |   3 +
 .../codehilite.py.yml                         |   2 +
 .../data/ics/markdown-markdown/html4.py.yml   |   3 +
 .../data/ics/mesa3d-docs/license.html.yml     |   4 +
 .../data/ics/mesa3d-docs/subset-A.html.yml    |   2 +
 .../data/ics/mesa3d-include-c99/stdbool.h.yml |   2 +
 .../ics/mesa3d-src-glsl-glcpp/Makefile.am.yml |   2 +
 .../ics/mesa3d-src-glsl/ir_to_llvm.cpp.yml    |   5 +
 .../data/ics/mesa3d-src-glsl/program.h.yml    |   4 +
 .../data/ics/mesa3d-src-glsl/strtod.c.yml     |   2 +
 .../ics/mesa3d-src-mesa-main/compiler.h.yml   |   3 +
 .../ics/mesa3d-src-mesa-main/config.h.yml     |   3 +
 .../data/ics/mesa3d-src-mesa-main/debug.h.yml |   2 +
 .../data/ics/mesa3d-src-mesa-main/get.h.yml   |   2 +
 .../ics/mesa3d-src-mesa-main/glheader.h.yml   |   2 +
 .../data/ics/mesa3d-src-mesa-main/hash.h.yml  |   2 +
 .../ics/mesa3d-src-mesa-main/shaderobj.h.yml  |   2 +
 .../mesa3d-src-mesa-main/simple_list.h.yml    |   3 +
 .../prog_statevars.h.yml                      |   2 +
 .../data/ics/mesa3d-test/m_matrix.c.yml       |   2 +
 .../data/ics/mesa3d-test/m_matrix.h.yml       |   2 +
 tests/cluecode/data/ics/mesa3d/NOTICE.yml     |   7 +
 .../data/ics/netperf/MODULE_LICENSE_HP.yml    |   3 +
 .../data/ics/netperf/netcpu_looper.c.yml      |   2 +
 tests/cluecode/data/ics/netperf/netlib.c.yml  |   2 +
 tests/cluecode/data/ics/netperf/netperf.c.yml |   4 +
 .../cluecode/data/ics/netperf/netserver.c.yml |   4 +
 .../data/ics/opencv-cv-include/cv.h.yml       |   2 +
 .../data/ics/opencv-cv-src/_cvkdtree.hpp.yml  |   2 +
 .../data/ics/opencv-cv-src/cvcolor.cpp.yml    |   3 +
 .../ics/opencv-cv-src/cvdistransform.cpp.yml  |   3 +
 .../data/ics/opencv-cv-src/cvemd.cpp.yml      |   3 +
 .../data/ics/opencv-cv-src/cvkdtree.cpp.yml   |   2 +
 .../data/ics/opencv-cv-src/cvsmooth.cpp.yml   |   3 +
 .../data/ics/opencv-cv-src/cvsurf.cpp.yml     |   2 +
 .../ics/opencv-cvaux-src/cv3dtracker.cpp.yml  |   2 +
 .../ics/opencv-cvaux-src/cvdpstereo.cpp.yml   |   2 +
 .../ics/opencv-cxcore-include/cvwimage.h.yml  |   2 +
 .../ics/opencv-cxcore-include/cxmisc.h.yml    |   3 +
 .../ics/opencv-cxcore-include/cxtypes.h.yml   |   3 +
 .../opencv-cxcore-src/cxdatastructs.cpp.yml   |   3 +
 .../ics/opencv-cxcore-src/cxutils.cpp.yml     |   4 +
 .../data/ics/opencv-ml-src/mlsvm.cpp.yml      |   3 +
 .../cvcap_socket.cpp.yml                      |   2 +
 .../grfmt_png.cpp.yml                         |   3 +
 .../data/ics/opencv/LICENSE_OpenCV.yml        |   2 +
 tests/cluecode/data/ics/opencv/NOTICE.yml     |  26 +++
 .../data/ics/openssl-apps/app_rand.c.yml      |   4 +
 .../cluecode/data/ics/openssl-apps/apps.c.yml |   4 +
 .../cluecode/data/ics/openssl-apps/apps.h.yml |   4 +
 .../data/ics/openssl-apps/asn1pars.c.yml      |   3 +
 .../cluecode/data/ics/openssl-apps/cms.c.yml  |   2 +
 tests/cluecode/data/ics/openssl-apps/ec.c.yml |   2 +
 .../data/ics/openssl-apps/ecparam.c.yml       |   3 +
 .../data/ics/openssl-apps/engine.c.yml        |   2 +
 .../data/ics/openssl-apps/genpkey.c.yml       |   2 +
 .../cluecode/data/ics/openssl-apps/nseq.c.yml |   2 +
 .../data/ics/openssl-apps/openssl.c.yml       |   4 +
 .../data/ics/openssl-apps/pkcs12.c.yml        |   2 +
 .../data/ics/openssl-apps/prime.c.yml         |   2 +
 .../cluecode/data/ics/openssl-apps/rand.c.yml |   2 +
 .../data/ics/openssl-apps/s_client.c.yml      |   5 +
 .../data/ics/openssl-apps/s_server.c.yml      |   6 +
 .../data/ics/openssl-apps/smime.c.yml         |   2 +
 .../data/ics/openssl-apps/speed.c.yml         |   4 +
 .../data/ics/openssl-apps/timeouts.h.yml      |   2 +
 .../data/ics/openssl-crypto-aes/aes.h.yml     |   2 +
 .../data/ics/openssl-crypto-aes/aes_cfb.c.yml |   2 +
 .../data/ics/openssl-crypto-asn1/a_sign.c.yml |   4 +
 .../ics/openssl-crypto-asn1/asn1_err.c.yml    |   2 +
 .../ics/openssl-crypto-asn1/asn1_gen.c.yml    |   2 +
 .../data/ics/openssl-crypto-asn1/asn1t.h.yml  |   2 +
 .../ics/openssl-crypto-asn1/asn_mime.c.yml    |   2 +
 .../ics/openssl-crypto-asn1/asn_moid.c.yml    |   2 +
 .../ics/openssl-crypto-asn1/tasn_dec.c.yml    |   2 +
 .../ics/openssl-crypto-asn1/tasn_enc.c.yml    |   2 +
 .../ics/openssl-crypto-asn1/tasn_prn.c.yml    |   2 +
 .../ics/openssl-crypto-asn1/x_nx509.c.yml     |   2 +
 .../data/ics/openssl-crypto-bf/COPYRIGHT.yml  |   2 +
 .../data/ics/openssl-crypto-bf/bf_locl.h.yml  |   3 +
 .../data/ics/openssl-crypto-bio/b_print.c.yml |   4 +
 .../data/ics/openssl-crypto-bio/bss_bio.c.yml |   2 +
 .../data/ics/openssl-crypto-bn/bn.h.yml       |   5 +
 .../data/ics/openssl-crypto-bn/bn_blind.c.yml |   4 +
 .../data/ics/openssl-crypto-bn/bn_ctx.c.yml   |   2 +
 .../data/ics/openssl-crypto-bn/bn_err.c.yml   |   2 +
 .../data/ics/openssl-crypto-bn/bn_exp.c.yml   |   4 +
 .../data/ics/openssl-crypto-bn/bn_gf2m.c.yml  |   3 +
 .../data/ics/openssl-crypto-bn/bn_lcl.h.yml   |   4 +
 .../data/ics/openssl-crypto-bn/bn_mod.c.yml   |   4 +
 .../ics/openssl-crypto-des-asm/des_enc.m4.yml |   3 +
 .../data/ics/openssl-crypto-des/README.yml    |   2 +
 .../ics/openssl-crypto-des/read2pwd.c.yml     |   4 +
 .../data/ics/openssl-crypto-des/rpc_des.h.yml |   4 +
 .../ics/openssl-crypto-dsa/dsa_locl.h.yml     |   2 +
 .../data/ics/openssl-crypto-ec/ec.h.yml       |   3 +
 .../data/ics/openssl-crypto-ec/ec2_mult.c.yml |   3 +
 .../data/ics/openssl-crypto-ec/ec2_smpl.c.yml |   3 +
 .../data/ics/openssl-crypto-ec/ec_asn1.c.yml  |   2 +
 .../data/ics/openssl-crypto-ec/ec_curve.c.yml |   3 +
 .../data/ics/openssl-crypto-ec/ec_mult.c.yml  |   3 +
 .../data/ics/openssl-crypto-ec/ecp_mont.c.yml |   3 +
 .../data/ics/openssl-crypto-ec/ecp_nist.c.yml |   3 +
 .../data/ics/openssl-crypto-ec/ecp_smpl.c.yml |   3 +
 .../data/ics/openssl-crypto-ecdh/ecdh.h.yml   |   3 +
 .../ics/openssl-crypto-ecdsa/ecdsatest.c.yml  |   3 +
 .../ics/openssl-crypto-ecdsa/ecs_asn1.c.yml   |   2 +
 .../ics/openssl-crypto-engine/eng_all.c.yml   |   2 +
 .../openssl-crypto-engine/eng_cryptodev.c.yml |   4 +
 .../ics/openssl-crypto-engine/eng_dyn.c.yml   |   2 +
 .../ics/openssl-crypto-engine/eng_err.c.yml   |   2 +
 .../ics/openssl-crypto-engine/eng_fat.c.yml   |   3 +
 .../ics/openssl-crypto-engine/engine.h.yml    |   3 +
 .../data/ics/openssl-crypto-evp/m_ecdsa.c.yml |   4 +
 .../ics/openssl-crypto-evp/m_sigver.c.yml     |   2 +
 .../data/ics/openssl-crypto-pem/pem_all.c.yml |   4 +
 .../ics/openssl-crypto-pkcs12/p12_crt.c.yml   |   2 +
 .../ics/openssl-crypto-rand/rand_win.c.yml    |   5 +
 .../ics/openssl-crypto-ui/ui_compat.c.yml     |   2 +
 .../ics/openssl-crypto-ui/ui_openssl.c.yml    |   4 +
 .../data/ics/openssl-crypto-x509/x509.h.yml   |   4 +
 .../ics/openssl-crypto-x509v3/v3_alt.c.yml    |   2 +
 .../ics/openssl-crypto-x509v3/v3_pci.c.yml    |   2 +
 .../data/ics/openssl-crypto/LPdir_nyi.c.yml   |   2 +
 .../data/ics/openssl-crypto/cryptlib.c.yml    |   5 +
 .../data/ics/openssl-crypto/md32_common.h.yml |   2 +
 .../data/ics/openssl-crypto/mem_clr.c.yml     |   2 +
 .../data/ics/openssl-crypto/o_str.c.yml       |   2 +
 .../ics/openssl-include-openssl/modes.h.yml   |   2 +
 .../ics/openssl-include-openssl/ssl.h.yml     |   6 +
 .../ics/openssl-include-openssl/ssl3.h.yml    |   5 +
 .../ics/openssl-include-openssl/tls1.h.yml    |   6 +
 .../data/ics/openssl-ssl/d1_both.c.yml        |   4 +
 .../data/ics/openssl-ssl/d1_clnt.c.yml        |   4 +
 .../data/ics/openssl-ssl/s2_lib.c.yml         |   4 +
 .../data/ics/openssl-ssl/s3_enc.c.yml         |   5 +
 .../data/ics/openssl-ssl/s3_lib.c.yml         |   6 +
 .../data/ics/openssl-ssl/ssl_asn1.c.yml       |   4 +
 .../data/ics/openssl-ssl/ssl_cert.c.yml       |   5 +
 .../data/ics/openssl-ssl/ssltest.c.yml        |   6 +
 .../data/ics/openssl-ssl/t1_reneg.c.yml       |   4 +
 tests/cluecode/data/ics/openssl/NOTICE.yml    |   4 +
 tests/cluecode/data/ics/openssl/e_os.h.yml    |   3 +
 tests/cluecode/data/ics/openssl/e_os2.h.yml   |   2 +
 .../oprofile-daemon-liblegacy/p_module.h.yml  |   2 +
 .../data/ics/oprofile-doc/oprofile.1.in.yml   |   2 +
 .../oprofile-events-ppc64-970MP/events.yml    |   3 +
 .../unit_masks.yml                            |   3 +
 .../ics/oprofile-libutil++/sparse_array.h.yml |   3 +
 tests/cluecode/data/ics/ping/NOTICE.yml       |   2 +
 tests/cluecode/data/ics/ping/ping.c.yml       |   3 +
 tests/cluecode/data/ics/ping6/NOTICE.yml      |   3 +
 tests/cluecode/data/ics/ping6/ping6.c.yml     |   4 +
 .../ics/ppp-pppd-include-net/ppp_defs.h.yml   |   2 +
 .../data/ics/ppp-pppd-include-net/pppio.h.yml |   2 +
 .../ics/ppp-pppd-include-net/slcompress.h.yml |   2 +
 .../ppp-pppd-plugins-pppoatm/pppoatm.c.yml    |   2 +
 .../ics/ppp-pppd-plugins-radius/avpair.c.yml  |   4 +
 .../ics/ppp-pppd-plugins-radius/config.c.yml  |   4 +
 .../ics/ppp-pppd-plugins-radius/dict.c.yml    |   5 +
 .../ppp-pppd-plugins-radius/includes.h.yml    |   4 +
 .../ppp-pppd-plugins-radius/pathnames.h.yml   |   4 +
 .../radiusclient.h.yml                        |   4 +
 .../ppp-pppd-plugins-rp-pppoe/plugin.c.yml    |   3 +
 .../data/ics/ppp-pppd-plugins/minconn.c.yml   |   2 +
 .../ics/ppp-pppd-plugins/passprompt.c.yml     |   2 +
 .../data/ics/ppp-pppd-plugins/winbind.c.yml   |  13 ++
 tests/cluecode/data/ics/ppp-pppd/NOTICE.yml   |  17 ++
 tests/cluecode/data/ics/ppp-pppd/auth.c.yml   |   3 +
 tests/cluecode/data/ics/ppp-pppd/cbcp.c.yml   |   2 +
 tests/cluecode/data/ics/ppp-pppd/ccp.c.yml    |   2 +
 .../cluecode/data/ics/ppp-pppd/chap_ms.c.yml  |   3 +
 .../cluecode/data/ics/ppp-pppd/chap_ms.h.yml  |   2 +
 tests/cluecode/data/ics/ppp-pppd/demand.c.yml |   2 +
 tests/cluecode/data/ics/ppp-pppd/eap.c.yml    |   2 +
 tests/cluecode/data/ics/ppp-pppd/ecp.c.yml    |   3 +
 tests/cluecode/data/ics/ppp-pppd/ecp.h.yml    |   2 +
 tests/cluecode/data/ics/ppp-pppd/eui64.c.yml  |   2 +
 tests/cluecode/data/ics/ppp-pppd/ipv6cp.c.yml |   5 +
 tests/cluecode/data/ics/ppp-pppd/main.c.yml   |   3 +
 tests/cluecode/data/ics/ppp-pppd/md5.c.yml    |   2 +
 tests/cluecode/data/ics/ppp-pppd/md5.h.yml    |   2 +
 tests/cluecode/data/ics/ppp-pppd/pppd.8.yml   |  11 ++
 tests/cluecode/data/ics/ppp-pppd/pppd.h.yml   |   2 +
 .../data/ics/ppp-pppd/sys-linux.c.yml         |   3 +
 .../data/ics/ppp-pppd/sys-solaris.c.yml       |   4 +
 tests/cluecode/data/ics/ppp-pppd/tty.c.yml    |   3 +
 tests/cluecode/data/ics/ppp-pppd/utils.c.yml  |   2 +
 .../GUIResources.properties.yml               |   3 +
 tests/cluecode/data/ics/proguard/NOTICE.yml   |   4 +
 .../data/ics/protobuf-editors/proto.vim.yml   |   2 +
 .../ics/protobuf-gtest-scons/SConscript.yml   |   2 +
 .../AbstractMessage.java.yml                  |   2 +
 .../javamicro_params.h.yml                    |   2 +
 .../tokenizer.cc.yml                          |   2 +
 .../structurally_valid.cc.yml                 |   2 +
 .../cluecode/data/ics/qemu-audio/mixeng.c.yml |   4 +
 .../SDLOSXCAGuard.c.yml                       |   3 +
 .../SDLOSXCAGuard.h.yml                       |   3 +
 .../FastTimes.c.yml                           |   2 +
 .../Xvlibint.h.yml                            |   2 +
 .../Xv.h.yml                                  |   2 +
 .../panoramiXext.h.yml                        |   2 +
 .../xme.h.yml                                 |   2 +
 .../riva_mmio.h.yml                           |   3 +
 .../SDL_macwm.c.yml                           |   3 +
 .../SDL_yuv_sw.c.yml                          |   5 +
 .../qemu-distrib-zlib-1.2.3/compress.c.yml    |   2 +
 .../ics/qemu-distrib-zlib-1.2.3/deflate.c.yml |   3 +
 .../ics/qemu-distrib-zlib-1.2.3/gzio.c.yml    |   2 +
 tests/cluecode/data/ics/qemu-elff/dwarf.h.yml |   4 +
 .../cluecode/data/ics/qemu-hw/arm-misc.h.yml  |   2 +
 tests/cluecode/data/ics/qemu-hw/armv7m.c.yml  |   2 +
 tests/cluecode/data/ics/qemu-hw/irq.c.yml     |   2 +
 tests/cluecode/data/ics/qemu-hw/sd.h.yml      |   2 +
 .../data/ics/qemu-slirp/COPYRIGHT.yml         |   3 +
 .../cluecode/data/ics/qemu-slirp/cksum.c.yml  |   2 +
 .../cluecode/data/ics/qemu-slirp/debug.c.yml  |   3 +
 .../cluecode/data/ics/qemu-slirp/debug.h.yml  |   2 +
 .../data/ics/qemu-slirp/ip_icmp.c.yml         |   2 +
 .../data/ics/qemu-slirp/ip_input.c.yml        |   3 +
 .../data/ics/qemu-slirp/ip_output.c.yml       |   3 +
 tests/cluecode/data/ics/qemu-slirp/misc.c.yml |   2 +
 .../data/ics/qemu-slirp/tcp_input.c.yml       |   3 +
 .../data/ics/qemu-slirp/tcp_timer.c.yml       |   2 +
 .../data/ics/qemu-slirp/tcp_var.h.yml         |   2 +
 .../ics/qemu-target-arm/neon_helper.c.yml     |   2 +
 tests/cluecode/data/ics/qemu/arm-semi.c.yml   |   2 +
 tests/cluecode/data/ics/qemu/d3des.c.yml      |   3 +
 tests/cluecode/data/ics/qemu/d3des.h.yml      |   3 +
 .../cluecode/data/ics/qemu/device_tree.c.yml  |   2 +
 tests/cluecode/data/ics/qemu/loader.c.yml     |   4 +
 .../cluecode/data/ics/qemu/softmmu-semi.h.yml |   2 +
 tests/cluecode/data/ics/qemu/sys-tree.h.yml   |   2 +
 .../cluecode/data/ics/qemu/uboot_image.h.yml  |   2 +
 .../quake-quake-src-QW-client/cd_linux.c.yml  |   3 +
 .../exitscrn.txt.yml                          |   2 +
 .../ics/quake-quake-src-QW-client/md4.c.yml   |   4 +
 .../ics/quake-quake-src-QW-client/menu.c.yml  |   3 +
 .../quake-quake-src-QW-client/qwcl.plg.yml    |  35 ++++
 .../d3d.h.yml                                 |   2 +
 .../ddraw.h.yml                               |   2 +
 .../dinput.h.yml                              |   2 +
 .../dplay.h.yml                               |   2 +
 .../dsound.h.yml                              |   2 +
 .../debug.h.yml                               |   2 +
 .../mgldos.h.yml                              |   2 +
 .../ics/quake-quake-src-WinQuake/3dfx.txt.yml |   2 +
 .../quake-quake-src-WinQuake/WinQuake.plg.yml |  37 +++++
 .../quake-quake-src-WinQuake/cl_input.cpp.yml |   3 +
 .../quake-quake-src-WinQuake/mpdosock.h.yml   |   3 +
 .../skia-include-ports/SkHarfBuzzFont.h.yml   |   2 +
 .../SkOSWindow_wxwidgets.h.yml                |   3 +
 .../ics/skia-src-opts/opts_check_arm.cpp.yml  |   3 +
 .../data/ics/skia-tests/FillPathTest.cpp.yml  |   2 +
 .../eas_fmsndlib.c.yml                        |   2 +
 .../data/ics/srtp-crypto-cipher/aes.c.yml     |   2 +
 .../data/ics/srtp-crypto-hash/hmac.c.yml      |   2 +
 .../data/ics/srtp-crypto-include/auth.h.yml   |   2 +
 .../srtp-crypto-include/kernel_compat.h.yml   |   2 +
 .../cluecode/data/ics/srtp-doc/intro.txt.yml  |   2 +
 .../data/ics/srtp-doc/rfc3711.txt.yml         |   3 +
 .../cluecode/data/ics/srtp-include/ekt.h.yml  |   2 +
 tests/cluecode/data/ics/srtp/LICENSE.yml      |   2 +
 .../ics/stlport-stlport-stl/type_traits.h.yml |   5 +
 .../stlport-test-eh/mwerks_console_OS_X.c.yml |   2 +
 tests/cluecode/data/ics/stlport/LICENSE.yml   |   5 +
 .../data/ics/strace-linux/dummy.h.yml         |   3 +
 .../data/ics/strace-linux/ioctlent.sh.yml     |   2 +
 .../strace-strace-linux-ia64/syscallent.h.yml |   2 +
 .../strace-strace-linux-mips/ioctlent.sh.yml  |   3 +
 .../strace-strace-linux-sparc/syscall.h.yml   |   3 +
 tests/cluecode/data/ics/strace/COPYRIGHT.yml  |   7 +
 tests/cluecode/data/ics/strace/bjm.c.yml      |   5 +
 tests/cluecode/data/ics/strace/defs.h.yml     |   4 +
 .../cluecode/data/ics/strace/errnoent.sh.yml  |   2 +
 tests/cluecode/data/ics/strace/ioctl.c.yml    |   5 +
 .../cluecode/data/ics/strace/ioctlsort.c.yml  |   3 +
 tests/cluecode/data/ics/strace/ipc.c.yml      |   5 +
 tests/cluecode/data/ics/strace/net.c.yml      |   5 +
 tests/cluecode/data/ics/strace/proc.c.yml     |   2 +
 .../cluecode/data/ics/strace/signalent.sh.yml |   2 +
 tests/cluecode/data/ics/strace/sock.c.yml     |   2 +
 tests/cluecode/data/ics/strace/strace.1.yml   |   4 +
 tests/cluecode/data/ics/strace/stream.c.yml   |   3 +
 .../data/ics/strace/syscallent.sh.yml         |   2 +
 .../data/ics/svox-pico-lib/picofftsg.c.yml    |   4 +
 .../data/ics/svox-pico-lib/picoos.c.yml       |   4 +
 .../en-GB_lexpos.utf.yml                      |   2 +
 .../buildbin.sh.yml                           |   2 +
 .../Readme.txt.yml                            |   2 +
 .../AutoDetector.java.yml                     |   2 +
 .../data/ics/tcpdump-missing/inet_aton.c.yml  |   2 +
 .../data/ics/tcpdump-missing/inet_ntop.c.yml  |   2 +
 .../cluecode/data/ics/tcpdump/Makefile.in.yml |   2 +
 .../cluecode/data/ics/tcpdump/aclocal.m4.yml  |   3 +
 .../data/ics/tcpdump/addrtoname.c.yml         |   2 +
 .../data/ics/tcpdump/addrtoname.h.yml         |   2 +
 tests/cluecode/data/ics/tcpdump/aodv.h.yml    |   2 +
 .../cluecode/data/ics/tcpdump/appletalk.h.yml |   2 +
 tests/cluecode/data/ics/tcpdump/atm.h.yml     |   2 +
 tests/cluecode/data/ics/tcpdump/bootp.h.yml   |   2 +
 tests/cluecode/data/ics/tcpdump/chdlc.h.yml   |   2 +
 tests/cluecode/data/ics/tcpdump/cpack.c.yml   |   2 +
 tests/cluecode/data/ics/tcpdump/decnet.h.yml  |   2 +
 .../data/ics/tcpdump/decode_prefix.h.yml      |   2 +
 tests/cluecode/data/ics/tcpdump/enc.h.yml     |   3 +
 .../cluecode/data/ics/tcpdump/gmt2local.c.yml |   2 +
 tests/cluecode/data/ics/tcpdump/icmp6.h.yml   |   3 +
 .../cluecode/data/ics/tcpdump/interface.h.yml |   2 +
 tests/cluecode/data/ics/tcpdump/ipproto.h.yml |   2 +
 tests/cluecode/data/ics/tcpdump/l2tp.h.yml    |   2 +
 tests/cluecode/data/ics/tcpdump/machdep.c.yml |   2 +
 tests/cluecode/data/ics/tcpdump/makemib.yml   |   3 +
 tests/cluecode/data/ics/tcpdump/mpls.h.yml    |   2 +
 tests/cluecode/data/ics/tcpdump/nameser.h.yml |   3 +
 .../data/ics/tcpdump/netdissect.h.yml         |   3 +
 tests/cluecode/data/ics/tcpdump/nfs.h.yml     |   2 +
 tests/cluecode/data/ics/tcpdump/nfsfh.h.yml   |   3 +
 .../data/ics/tcpdump/parsenfsfh.c.yml         |   3 +
 .../cluecode/data/ics/tcpdump/print-ah.c.yml  |   2 +
 .../data/ics/tcpdump/print-ap1394.c.yml       |   2 +
 .../data/ics/tcpdump/print-ascii.c.yml        |   2 +
 .../cluecode/data/ics/tcpdump/print-atm.c.yml |   2 +
 .../data/ics/tcpdump/print-bootp.c.yml        |   2 +
 .../cluecode/data/ics/tcpdump/print-cdp.c.yml |   2 +
 .../data/ics/tcpdump/print-cnfp.c.yml         |   2 +
 .../data/ics/tcpdump/print-dhcp6.c.yml        |   2 +
 .../data/ics/tcpdump/print-dvmrp.c.yml        |   2 +
 .../cluecode/data/ics/tcpdump/print-egp.c.yml |   2 +
 .../cluecode/data/ics/tcpdump/print-enc.c.yml |   2 +
 .../data/ics/tcpdump/print-fddi.c.yml         |   2 +
 .../data/ics/tcpdump/print-frag6.c.yml        |   2 +
 .../cluecode/data/ics/tcpdump/print-gre.c.yml |   2 +
 .../data/ics/tcpdump/print-hsrp.c.yml         |   2 +
 .../data/ics/tcpdump/print-ip6opts.c.yml      |   2 +
 .../cluecode/data/ics/tcpdump/print-krb.c.yml |   2 +
 .../data/ics/tcpdump/print-lwres.c.yml        |   2 +
 .../data/ics/tcpdump/print-mobile.c.yml       |   2 +
 .../data/ics/tcpdump/print-mobility.c.yml     |   2 +
 .../data/ics/tcpdump/print-msdp.c.yml         |   2 +
 .../data/ics/tcpdump/print-radius.c.yml       |   2 +
 .../cluecode/data/ics/tcpdump/print-rip.c.yml |   2 +
 .../data/ics/tcpdump/print-ripng.c.yml        |   2 +
 .../cluecode/data/ics/tcpdump/print-rx.c.yml  |   2 +
 .../cluecode/data/ics/tcpdump/print-sl.c.yml  |   2 +
 .../data/ics/tcpdump/print-snmp.c.yml         |   4 +
 .../cluecode/data/ics/tcpdump/print-tcp.c.yml |   3 +
 .../data/ics/tcpdump/print-telnet.c.yml       |   3 +
 .../data/ics/tcpdump/print-timed.c.yml        |   2 +
 .../data/ics/tcpdump/print-token.c.yml        |   2 +
 .../data/ics/tcpdump/print-vrrp.c.yml         |   2 +
 .../cluecode/data/ics/tcpdump/print-wb.c.yml  |   2 +
 .../data/ics/tcpdump/print-zephyr.c.yml       |   2 +
 tests/cluecode/data/ics/tcpdump/route6d.h.yml |   2 +
 .../data/ics/tcpdump/slcompress.h.yml         |   2 +
 tests/cluecode/data/ics/tcpdump/slip.h.yml    |   2 +
 .../data/ics/tcpdump/strcasecmp.c.yml         |   2 +
 tests/cluecode/data/ics/tcpdump/tcpdump.1.yml |   2 +
 tests/cluecode/data/ics/tcpdump/tcpdump.c.yml |   4 +
 tests/cluecode/data/ics/tcpdump/telnet.h.yml  |   2 +
 tests/cluecode/data/ics/tcpdump/token.h.yml   |   2 +
 .../cluecode/data/ics/tcpdump/vfprintf.c.yml  |   2 +
 .../data/ics/tremolo-Tremolo/asm_arm.h.yml    |   3 +
 tests/cluecode/data/ics/tremolo/NOTICE.yml    |   3 +
 .../spreadsort.hpp.yml                        |   2 +
 .../data/ics/webrtc-src/common_types.h.yml    |   2 +
 tests/cluecode/data/ics/webrtc/NOTICE.yml     |   6 +
 .../data/ics/webrtc/android-webrtc.mk.yml     |   2 +
 .../wpa_supplicant-wpa_gui-qt4/wpagui.cpp.yml |   3 +
 .../wpa_supplicant-wpa_gui/wpagui.ui.h.yml    |   2 +
 .../data/ics/wpa_supplicant/NOTICE.yml        |   2 +
 .../ics/wpa_supplicant/driver_atmel.c.yml     |   4 +
 .../ics/wpa_supplicant/wireless_copy.h.yml    |   2 +
 .../XMLWriter.java.yml                        |   2 +
 .../data/ics/yaffs2-yaffs2/yaffs_qsort.h.yml  |   2 +
 .../ics/zlib-contrib-masmx86/gvmat32c.c.yml   |   2 +
 .../data/ics/zlib-contrib-minizip/unzip.c.yml |   8 +
 .../ics/zlib-contrib-pascal/readme.txt.yml    |   7 +
 .../data/ics/zlib-contrib-puff/puff.h.yml     |   2 +
 .../data/ics/zlib-examples/gzappend.c.yml     |   3 +
 .../data/ics/zlib-examples/gzjoin.c.yml       |   2 +
 .../data/ics/zlib-examples/gzlog.c.yml        |   2 +
 .../data/ics/zlib-examples/gzlog.h.yml        |   2 +
 .../data/ics/zlib-examples/zlib_how.html.yml  |   3 +
 .../data/ics/zlib-msdos/Makefile.dj2.yml      |   2 +
 .../data/ics/zlib-old-visualc6/README.txt.yml |   3 +
 .../data/ics/zlib-win32/Makefile.gcc.yml      |   2 +
 tests/cluecode/data/ics/zlib/Makefile.in.yml  |   2 +
 tests/cluecode/data/ics/zlib/example.c.yml    |   2 +
 tests/cluecode/data/ics/zlib/minigzip.c.yml   |   2 +
 tests/cluecode/data/ics/zlib/uncompr.c.yml    |   2 +
 tests/cluecode/data/ics/zlib/zconf.h.yml      |   2 +
 tests/cluecode/data/ics/zlib/zutil.c.yml      |   2 +
 ...in_copyright-COPYRIGHT_madwifi.madwifi.yml |   2 +
 .../cluecode/data/years/years_in_h-ah_h.h.yml |   2 +
 .../data/years/years_in_readme-README.yml     |   2 +
 ...uencode_binary-mips_be_elf_hal_o_uu.uu.yml |   2 +
 .../test_copyrights_with_allrightsreserved.py |  39 +++++
 1567 files changed, 5029 insertions(+), 14 deletions(-)
 create mode 100644 tests/cluecode/test_copyrights_with_allrightsreserved.py

diff --git a/tests/cluecode/cluecode_test_utils.py b/tests/cluecode/cluecode_test_utils.py
index e3b0b4781b..411852a601 100644
--- a/tests/cluecode/cluecode_test_utils.py
+++ b/tests/cluecode/cluecode_test_utils.py
@@ -55,6 +55,7 @@ class CopyrightTest(object):
     # one of holders, copyrights, authors
     what = attr.ib(default=attr.Factory(list))
     copyrights = attr.ib(default=attr.Factory(list))
+    allrights = attr.ib(default=attr.Factory(list))
     holders = attr.ib(default=attr.Factory(list))
     authors = attr.ib(default=attr.Factory(list))
 
@@ -175,6 +176,7 @@ def make_copyright_test_functions(
     index,
     test_data_dir=test_env.test_data_dir,
     regen=REGEN_TEST_FIXTURES,
+    with_allrights=False,
 ):
     """
     Build and return a test function closing on tests arguments and the function
@@ -188,7 +190,7 @@ def make_copyright_test_functions(
     from summarycode.copyright_tallies import tally_persons
 
     def closure_test_function(*args, **kwargs):
-        detections = detect_copyrights(test_file)
+        detections = detect_copyrights(test_file, include_copyright_allrights=with_allrights)
         copyrights, holders, authors = Detection.split_values(detections)
 
         holders_summary = []
@@ -215,7 +217,12 @@ def closure_test_function(*args, **kwargs):
         expected_yaml = test.dumps()
 
         for wht in test.what:
-            setattr(test, wht, results.get(wht))
+            # use the fact we are overriding attributes, leave copyrights as is
+            # and add allrights section. This shortcut needs a better solution.
+            if test.allrights and with_allrights and wht == 'copyrights':
+                setattr(test, 'allrights', results.get(wht))
+            else:
+                setattr(test, wht, results.get(wht))
         results_yaml = test.dumps()
 
         if regen:
@@ -246,6 +253,7 @@ def build_tests(
     clazz,
     test_data_dir=test_env.test_data_dir,
     regen=REGEN_TEST_FIXTURES,
+    with_allrights=False,
 ):
     """
     Dynamically build test methods from a sequence of CopyrightTest and attach
@@ -263,6 +271,7 @@ def build_tests(
             index=i,
             test_data_dir=test_data_dir,
             regen=actual_regen,
+            with_allrights=with_allrights,
         )
 
         # attach that method to our test class
diff --git a/tests/cluecode/data/authors/author-config.rpath.yml b/tests/cluecode/data/authors/author-config.rpath.yml
index 91ed9be1ac..443ef93cc4 100644
--- a/tests/cluecode/data/authors/author-config.rpath.yml
+++ b/tests/cluecode/data/authors/author-config.rpath.yml
@@ -6,3 +6,5 @@ authors:
 authors_summary:
   - value: Gordon Matzigkeit <gord@gnu.ai.mit.edu>
     count: 1
+allrights:
+  - Copyright 1996-2006 Free Software Foundation, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/author_addr_c-addr_c.c.yml b/tests/cluecode/data/authors/author_addr_c-addr_c.c.yml
index 110f6c71b1..f05d3fad3a 100644
--- a/tests/cluecode/data/authors/author_addr_c-addr_c.c.yml
+++ b/tests/cluecode/data/authors/author_addr_c-addr_c.c.yml
@@ -6,3 +6,6 @@ authors:
 authors_summary:
   - value: John Doe
     count: 1
+allrights:
+  - Copyright 1999 Cornell University. All rights reserved.
+  - Copyright 2000 Jon Doe. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/author_avinash-BitVector_py.py.yml b/tests/cluecode/data/authors/author_avinash-BitVector_py.py.yml
index 2f0bb97ab0..88cbcdf939 100644
--- a/tests/cluecode/data/authors/author_avinash-BitVector_py.py.yml
+++ b/tests/cluecode/data/authors/author_avinash-BitVector_py.py.yml
@@ -7,3 +7,5 @@ authors:
 authors_summary:
   - value: Avinash Kak (kak@purdue.edu)
     count: 2
+allrights:
+  - (c) 2008 Avinash Kak. Python Software Foundation.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/author_avinash_kak-BitVector_py.py.yml b/tests/cluecode/data/authors/author_avinash_kak-BitVector_py.py.yml
index 2f0bb97ab0..88cbcdf939 100644
--- a/tests/cluecode/data/authors/author_avinash_kak-BitVector_py.py.yml
+++ b/tests/cluecode/data/authors/author_avinash_kak-BitVector_py.py.yml
@@ -7,3 +7,5 @@ authors:
 authors_summary:
   - value: Avinash Kak (kak@purdue.edu)
     count: 2
+allrights:
+  - (c) 2008 Avinash Kak. Python Software Foundation.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/author_complex_author-strtol_c.c.yml b/tests/cluecode/data/authors/author_complex_author-strtol_c.c.yml
index 4d26eb31d0..f1e90c1a71 100644
--- a/tests/cluecode/data/authors/author_complex_author-strtol_c.c.yml
+++ b/tests/cluecode/data/authors/author_complex_author-strtol_c.c.yml
@@ -6,3 +6,5 @@ authors:
 authors_summary:
   - value: the University of California, Berkeley and its contributors
     count: 1
+allrights:
+  - Copyright (c) 1990 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/author_correct-detail_9_html.html.yml b/tests/cluecode/data/authors/author_correct-detail_9_html.html.yml
index a80c0f83d1..a8e01e7054 100644
--- a/tests/cluecode/data/authors/author_correct-detail_9_html.html.yml
+++ b/tests/cluecode/data/authors/author_correct-detail_9_html.html.yml
@@ -1,3 +1,5 @@
 what:
   - authors
   - authors_summary
+allrights:
+  - (c) Oss http://s.pudn.com/upload_log.asp?e
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/author_expat-expat_h.h.yml b/tests/cluecode/data/authors/author_expat-expat_h.h.yml
index a80c0f83d1..da78592f02 100644
--- a/tests/cluecode/data/authors/author_expat-expat_h.h.yml
+++ b/tests/cluecode/data/authors/author_expat-expat_h.h.yml
@@ -1,3 +1,5 @@
 what:
   - authors
   - authors_summary
+allrights:
+  - Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/author_gary-ProjectInfo_java.java.yml b/tests/cluecode/data/authors/author_gary-ProjectInfo_java.java.yml
index b5a3451c67..7d0e3433ec 100644
--- a/tests/cluecode/data/authors/author_gary-ProjectInfo_java.java.yml
+++ b/tests/cluecode/data/authors/author_gary-ProjectInfo_java.java.yml
@@ -6,3 +6,5 @@ authors:
 authors_summary:
   - value: Gary O'Neall
     count: 1
+allrights:
+  - Copyright (c) 2009 Source Auditor Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/author_in_java-MergeSort_java.java.yml b/tests/cluecode/data/authors/author_in_java-MergeSort_java.java.yml
index 0aa44ce712..4dc927f013 100644
--- a/tests/cluecode/data/authors/author_in_java-MergeSort_java.java.yml
+++ b/tests/cluecode/data/authors/author_in_java-MergeSort_java.java.yml
@@ -6,3 +6,5 @@ authors:
 authors_summary:
   - value: Scott Violet
     count: 1
+allrights:
+  - Copyright (c) 1998 Sun Microsystems, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/author_in_java_tag-java.java.yml b/tests/cluecode/data/authors/author_in_java_tag-java.java.yml
index 2f33496e92..0a2f149a6b 100644
--- a/tests/cluecode/data/authors/author_in_java_tag-java.java.yml
+++ b/tests/cluecode/data/authors/author_in_java_tag-java.java.yml
@@ -6,3 +6,5 @@ authors:
 authors_summary:
   - value: Apple Banana Car
     count: 1
+allrights:
+  - Copyright (c) 2000-2007, Sample ABC Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/author_in_postcript-9__ps.ps.yml b/tests/cluecode/data/authors/author_in_postcript-9__ps.ps.yml
index a80c0f83d1..0cf5a67898 100644
--- a/tests/cluecode/data/authors/author_in_postcript-9__ps.ps.yml
+++ b/tests/cluecode/data/authors/author_in_postcript-9__ps.ps.yml
@@ -1,3 +1,5 @@
 what:
   - authors
   - authors_summary
+allrights:
+  - Copyright 1999 Radical Eye Software
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/author_none_c-c.c.yml b/tests/cluecode/data/authors/author_none_c-c.c.yml
index a80c0f83d1..82e2bc0218 100644
--- a/tests/cluecode/data/authors/author_none_c-c.c.yml
+++ b/tests/cluecode/data/authors/author_none_c-c.c.yml
@@ -1,3 +1,5 @@
 what:
   - authors
   - authors_summary
+allrights:
+  - Copyright (c) 1998-2000 The Internet Software Consortium. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/author_none_sample_java-java.java.yml b/tests/cluecode/data/authors/author_none_sample_java-java.java.yml
index 01a4c4d310..37f2b7feb4 100644
--- a/tests/cluecode/data/authors/author_none_sample_java-java.java.yml
+++ b/tests/cluecode/data/authors/author_none_sample_java-java.java.yml
@@ -6,3 +6,5 @@ authors:
 authors_summary:
   - value: not attributable
     count: 1
+allrights:
+  - Copyright (c) 2005 Company
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/author_samplepy-py.py.yml b/tests/cluecode/data/authors/author_samplepy-py.py.yml
index a80c0f83d1..2560818c1e 100644
--- a/tests/cluecode/data/authors/author_samplepy-py.py.yml
+++ b/tests/cluecode/data/authors/author_samplepy-py.py.yml
@@ -1,3 +1,5 @@
 what:
   - authors
   - authors_summary
+allrights:
+  - COPYRIGHT 2006 ABC ABC CONFIDENTIAL PROPRIETARY
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/author_stacktrace_cpp-stacktrace_cpp.cpp.yml b/tests/cluecode/data/authors/author_stacktrace_cpp-stacktrace_cpp.cpp.yml
index 54a5b04af3..b80336b07a 100644
--- a/tests/cluecode/data/authors/author_stacktrace_cpp-stacktrace_cpp.cpp.yml
+++ b/tests/cluecode/data/authors/author_stacktrace_cpp-stacktrace_cpp.cpp.yml
@@ -6,3 +6,5 @@ authors:
 authors_summary:
   - value: faith@dict.org
     count: 1
+allrights:
+  - Copyright 2003, 2004 Rickard E. Faith (faith@dict.org)
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/author_treetablemodeladapter_java-TreeTableModelAdapter_java.java.yml b/tests/cluecode/data/authors/author_treetablemodeladapter_java-TreeTableModelAdapter_java.java.yml
index 2d7b8301f0..4052e5bd54 100644
--- a/tests/cluecode/data/authors/author_treetablemodeladapter_java-TreeTableModelAdapter_java.java.yml
+++ b/tests/cluecode/data/authors/author_treetablemodeladapter_java-TreeTableModelAdapter_java.java.yml
@@ -9,3 +9,5 @@ authors_summary:
     count: 1
   - value: Scott Violet
     count: 1
+allrights:
+  - Copyright 1997, 1998 by Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, California, 94303, U.S.A. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/author_uc-LICENSE.yml b/tests/cluecode/data/authors/author_uc-LICENSE.yml
index 41e5fc74e8..fb02e74578 100644
--- a/tests/cluecode/data/authors/author_uc-LICENSE.yml
+++ b/tests/cluecode/data/authors/author_uc-LICENSE.yml
@@ -10,3 +10,8 @@ authors_summary:
     count: 2
   - value: UC Berkeley and its contributors
     count: 1
+allrights:
+  - copyrighted by The Regents of the University of California.
+  - Copyright 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 The Regents of the University of California. All rights reserved.
+  - copyright C 1988 by the Institute of Electrical and Electronics Engineers, Inc.
+  - copyright of UC Berkeley's Berkeley Software
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/author_var_route_c-var_route_c.c.yml b/tests/cluecode/data/authors/author_var_route_c-var_route_c.c.yml
index f4e3648a3a..9d57c28f50 100644
--- a/tests/cluecode/data/authors/author_var_route_c-var_route_c.c.yml
+++ b/tests/cluecode/data/authors/author_var_route_c-var_route_c.c.yml
@@ -12,3 +12,6 @@ authors_summary:
     count: 1
   - value: Simon Leinen (simon@switch.ch)
     count: 1
+allrights:
+  - Copyright 1988, 1989 by Carnegie Mellon University
+  - Copyright 1989 TGV, Incorporated
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/configure.yml b/tests/cluecode/data/authors/configure.yml
index 91ed9be1ac..90cd1a05e2 100644
--- a/tests/cluecode/data/authors/configure.yml
+++ b/tests/cluecode/data/authors/configure.yml
@@ -6,3 +6,9 @@ authors:
 authors_summary:
   - value: Gordon Matzigkeit <gord@gnu.ai.mit.edu>
     count: 1
+allrights:
+  - Copyright (c) 2003 Free Software Foundation, Inc.
+  - Copyright (c) 2003 Free Software Foundation, Inc.
+  - Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+  - Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+  - Copyright (c) 2003 Free Software Foundation, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/device_tree.c.yml b/tests/cluecode/data/authors/device_tree.c.yml
index e01d2901a3..41222df5d8 100644
--- a/tests/cluecode/data/authors/device_tree.c.yml
+++ b/tests/cluecode/data/authors/device_tree.c.yml
@@ -6,3 +6,5 @@ authors:
 authors_summary:
   - value: Jerone Young <jyoung5@us.ibm.com> Hollis Blanchard <hollisb@us.ibm.com>
     count: 1
+allrights:
+  - Copyright 2008 IBM Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/expat-ltmain.sh.yml b/tests/cluecode/data/authors/expat-ltmain.sh.yml
index 91ed9be1ac..f38eef2d10 100644
--- a/tests/cluecode/data/authors/expat-ltmain.sh.yml
+++ b/tests/cluecode/data/authors/expat-ltmain.sh.yml
@@ -6,3 +6,6 @@ authors:
 authors_summary:
   - value: Gordon Matzigkeit <gord@gnu.ai.mit.edu>
     count: 1
+allrights:
+  - Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+  - Copyright (c) 2005 Free Software Foundation, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/fixed_bfin.h.yml b/tests/cluecode/data/authors/fixed_bfin.h.yml
index 30a123c507..2757d6a8a9 100644
--- a/tests/cluecode/data/authors/fixed_bfin.h.yml
+++ b/tests/cluecode/data/authors/fixed_bfin.h.yml
@@ -6,3 +6,5 @@ authors:
 authors_summary:
   - value: Jean-Marc Valin
     count: 1
+allrights:
+  - Copyright (c) 2005 Analog Devices
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/ibm_and_authors_are_detected_authors.txt.yml b/tests/cluecode/data/authors/ibm_and_authors_are_detected_authors.txt.yml
index 8075cdf178..f132b3b181 100644
--- a/tests/cluecode/data/authors/ibm_and_authors_are_detected_authors.txt.yml
+++ b/tests/cluecode/data/authors/ibm_and_authors_are_detected_authors.txt.yml
@@ -6,3 +6,5 @@ authors:
 authors_summary:
   - value: Anthony Liguori <aliguori@us.ibm.com>
     count: 1
+allrights:
+  - Copyright IBM, Corp. 2007
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/is_not_mixed_with_authors.txt.yml b/tests/cluecode/data/authors/is_not_mixed_with_authors.txt.yml
index ff70e613da..26d34f636f 100644
--- a/tests/cluecode/data/authors/is_not_mixed_with_authors.txt.yml
+++ b/tests/cluecode/data/authors/is_not_mixed_with_authors.txt.yml
@@ -6,3 +6,5 @@ authors:
 authors_summary:
   - value: Nikos Mavrogiannopoulos
     count: 1
+allrights:
+  - Copyright (c) 2000-2012 Free Software Foundation, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/libtool.m4.yml b/tests/cluecode/data/authors/libtool.m4.yml
index 91ed9be1ac..7ee0b6aa0f 100644
--- a/tests/cluecode/data/authors/libtool.m4.yml
+++ b/tests/cluecode/data/authors/libtool.m4.yml
@@ -6,3 +6,6 @@ authors:
 authors_summary:
   - value: Gordon Matzigkeit <gord@gnu.ai.mit.edu>
     count: 1
+allrights:
+  - Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+  - Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/ltcf-c.sh.yml b/tests/cluecode/data/authors/ltcf-c.sh.yml
index 91ed9be1ac..57b057e2fd 100644
--- a/tests/cluecode/data/authors/ltcf-c.sh.yml
+++ b/tests/cluecode/data/authors/ltcf-c.sh.yml
@@ -6,3 +6,5 @@ authors:
 authors_summary:
   - value: Gordon Matzigkeit <gord@gnu.ai.mit.edu>
     count: 1
+allrights:
+  - Copyright (c) 1996-2000, 2001 Free Software Foundation, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/ltcf-cxx.sh.yml b/tests/cluecode/data/authors/ltcf-cxx.sh.yml
index 91ed9be1ac..fb2e2f115c 100644
--- a/tests/cluecode/data/authors/ltcf-cxx.sh.yml
+++ b/tests/cluecode/data/authors/ltcf-cxx.sh.yml
@@ -6,3 +6,5 @@ authors:
 authors_summary:
   - value: Gordon Matzigkeit <gord@gnu.ai.mit.edu>
     count: 1
+allrights:
+  - Copyright (c) 1996-1999, 2000, 2001, 2003 Free Software Foundation, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/ltmain.sh.yml b/tests/cluecode/data/authors/ltmain.sh.yml
index 91ed9be1ac..7cd4e071ee 100644
--- a/tests/cluecode/data/authors/ltmain.sh.yml
+++ b/tests/cluecode/data/authors/ltmain.sh.yml
@@ -6,3 +6,6 @@ authors:
 authors_summary:
   - value: Gordon Matzigkeit <gord@gnu.ai.mit.edu>
     count: 1
+allrights:
+  - Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+  - Copyright (c) 2007 Free Software Foundation, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/mcbsp.h.yml b/tests/cluecode/data/authors/mcbsp.h.yml
index fcf8dd397b..1863ad596b 100644
--- a/tests/cluecode/data/authors/mcbsp.h.yml
+++ b/tests/cluecode/data/authors/mcbsp.h.yml
@@ -6,3 +6,5 @@ authors:
 authors_summary:
   - value: Steve Johnson
     count: 1
+allrights:
+  - Copyright (c) 2002 RidgeRun, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/memory-input-stream.c.yml b/tests/cluecode/data/authors/memory-input-stream.c.yml
index e456e1d64c..2a4c96aa83 100644
--- a/tests/cluecode/data/authors/memory-input-stream.c.yml
+++ b/tests/cluecode/data/authors/memory-input-stream.c.yml
@@ -6,3 +6,5 @@ authors:
 authors_summary:
   - value: Tim Janik
     count: 1
+allrights:
+  - Copyright (c) 2007 Imendio AB
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/strverscmp.c.yml b/tests/cluecode/data/authors/strverscmp.c.yml
index fe8f922579..545fade8e1 100644
--- a/tests/cluecode/data/authors/strverscmp.c.yml
+++ b/tests/cluecode/data/authors/strverscmp.c.yml
@@ -6,3 +6,5 @@ authors:
 authors_summary:
   - value: Jean-Francois Bignolles <bignolle@ecoledoc.ibp.fr>
     count: 1
+allrights:
+  - Copyright (c) 1997, 2002, 2005 Free Software Foundation, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/strverscmp2.c.yml b/tests/cluecode/data/authors/strverscmp2.c.yml
index fe8f922579..5847e3bd56 100644
--- a/tests/cluecode/data/authors/strverscmp2.c.yml
+++ b/tests/cluecode/data/authors/strverscmp2.c.yml
@@ -6,3 +6,5 @@ authors:
 authors_summary:
   - value: Jean-Francois Bignolles <bignolle@ecoledoc.ibp.fr>
     count: 1
+allrights:
+  - Copyright (c) 1997, 2000, 2002, 2004 Free Software Foundation, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/vcdiff-ltmain.sh.yml b/tests/cluecode/data/authors/vcdiff-ltmain.sh.yml
index 91ed9be1ac..e3a9f62957 100644
--- a/tests/cluecode/data/authors/vcdiff-ltmain.sh.yml
+++ b/tests/cluecode/data/authors/vcdiff-ltmain.sh.yml
@@ -6,3 +6,6 @@ authors:
 authors_summary:
   - value: Gordon Matzigkeit <gord@gnu.ai.mit.edu>
     count: 1
+allrights:
+  - Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+  - Copyright (c) 2008 Free Software Foundation, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/wcstok.c.yml b/tests/cluecode/data/authors/wcstok.c.yml
index 07ffe30640..644a815b5f 100644
--- a/tests/cluecode/data/authors/wcstok.c.yml
+++ b/tests/cluecode/data/authors/wcstok.c.yml
@@ -6,3 +6,6 @@ authors:
 authors_summary:
   - value: Wes Peters <wes@softweyr.com>
     count: 1
+allrights:
+  - Copyright (c) 1998 Softweyr LLC. All rights reserved.
+  - Copyright (c) 1988, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/authors/with_date_in_angle_brackets_authors.txt.yml b/tests/cluecode/data/authors/with_date_in_angle_brackets_authors.txt.yml
index 26875e2af0..23b0cc08c5 100644
--- a/tests/cluecode/data/authors/with_date_in_angle_brackets_authors.txt.yml
+++ b/tests/cluecode/data/authors/with_date_in_angle_brackets_authors.txt.yml
@@ -6,3 +6,5 @@ authors:
 authors_summary:
   - value: bj@open-rnd.pl
     count: 1
+allrights:
+  - Copyright (c) 2013, GENIVI Alliance, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata0.yml b/tests/cluecode/data/copyright_fossology/testdata0.yml
index 8cf5731c50..77567e1af3 100644
--- a/tests/cluecode/data/copyright_fossology/testdata0.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata0.yml
@@ -14,3 +14,8 @@ holders:
   - Theo de Raadt
 authors:
   - Tatu Ylonen <ylo@cs.hut.fi>
+allrights:
+  - Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi> , Espoo, Finland All rights reserved
+  - Copyright (c) 1999,2000 Markus Friedl. All rights reserved.
+  - Copyright (c) 1999 Aaron Campbell. All rights reserved.
+  - Copyright (c) 1999 Theo de Raadt. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata1.yml b/tests/cluecode/data/copyright_fossology/testdata1.yml
index fad4bea8e4..6e827b24ce 100644
--- a/tests/cluecode/data/copyright_fossology/testdata1.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata1.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2008, 2009 Matthew Hall and others
 holders:
   - Matthew Hall and others
+allrights:
+  - Copyright (c) 2008, 2009 Matthew Hall and others. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata10.yml b/tests/cluecode/data/copyright_fossology/testdata10.yml
index dc7ebec7ca..cac4bfde60 100644
--- a/tests/cluecode/data/copyright_fossology/testdata10.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata10.yml
@@ -6,3 +6,5 @@ copyrights:
   - (c) Copyright Microsoft Corporation
 holders:
   - Microsoft Corporation
+allrights:
+  - (c) Copyright Microsoft Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata100.yml b/tests/cluecode/data/copyright_fossology/testdata100.yml
index a633286b6f..ca89fcf2bf 100644
--- a/tests/cluecode/data/copyright_fossology/testdata100.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata100.yml
@@ -20,3 +20,9 @@ authors:
   - Benjamin Drieu <benj@debian.org>
   - Graham Wilson <graham@debian.org>
   - Nico Golde <nion@debian.org> and Hector Garcia <hector@debian.org>
+allrights:
+  - Copyright 1997 by Eric S. Raymond.
+  - copyrighted by Carl E. Harris, 1993 and 1995.
+  - copyright by Andrew Tridgell
+  - Copyright (c) 1996,1997 by George M. Sipe.
+  - Copyright (c) 1997 Doug Muth, Wescosville, Pennsylvania USA All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata109.yml b/tests/cluecode/data/copyright_fossology/testdata109.yml
index 9e625e78fd..c73540d28b 100644
--- a/tests/cluecode/data/copyright_fossology/testdata109.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata109.yml
@@ -15,3 +15,7 @@ authors:
   - Chris Fearnley <cjf@netaxs.com>
   - Ian Murdock <imurdock@debian.org>
   - James Troup <james@nocrew.org>
+allrights:
+  - Copyright (c) 1989-2006 Free Software Foundation.
+  - Copyright (c) 1995-1997 Chris Fearnley.
+  - Copyright (c) 1998-2006 James Troup.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata114.yml b/tests/cluecode/data/copyright_fossology/testdata114.yml
index ff9f369f0e..68fdf564a6 100644
--- a/tests/cluecode/data/copyright_fossology/testdata114.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata114.yml
@@ -10,3 +10,6 @@ holders:
   - The NetBSD Foundation, Inc.
 authors:
   - the NetBSD Foundation, Inc. and its contributors
+allrights:
+  - Copyright (c) 2000, 2001, 2006 Debian.
+  - Copyright (c) 1999 The NetBSD Foundation, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata115.yml b/tests/cluecode/data/copyright_fossology/testdata115.yml
index ff9f369f0e..68fdf564a6 100644
--- a/tests/cluecode/data/copyright_fossology/testdata115.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata115.yml
@@ -10,3 +10,6 @@ holders:
   - The NetBSD Foundation, Inc.
 authors:
   - the NetBSD Foundation, Inc. and its contributors
+allrights:
+  - Copyright (c) 2000, 2001, 2006 Debian.
+  - Copyright (c) 1999 The NetBSD Foundation, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata118.yml b/tests/cluecode/data/copyright_fossology/testdata118.yml
index 86430175b6..554c04bd7f 100644
--- a/tests/cluecode/data/copyright_fossology/testdata118.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata118.yml
@@ -41,3 +41,21 @@ holders:
 authors:
   - Masayuki Hatta (mhatta)
   - artofcode LLC. http://artofcode.com
+allrights:
+  - Copyright (c) Artifex Software Inc., All Rights Reserved.
+  - copyright Adobe Systems Incorporated
+  - Copyright (c) 1997-2002 Graeme W. Gill
+  - Copyright (c) 1999-2000 Image Power, Inc.
+  - Copyright (c) 1999-2000 The University of British Columbia
+  - Copyright (c) 2001-2003 Michael David Adams
+  - copyright (c) 1991-1998, Thomas G. Lane. All Rights Reserved
+  - copyright holder, Aladdin Enterprises of Menlo Park
+  - copyright by the Free Software Foundation
+  - copyright by M.I.T.
+  - Copyright property of CompuServe Incorporated.
+  - Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson
+  - Copyright (c) 2000-2002 Glenn Randers-Pehrson
+  - Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+  - Copyright (c) 1996, 1997 Andreas Dilger
+  - Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+  - Copyright (c) 1995-2005 Jean-loup Gailly and Mark Adler
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata119.yml b/tests/cluecode/data/copyright_fossology/testdata119.yml
index 86430175b6..554c04bd7f 100644
--- a/tests/cluecode/data/copyright_fossology/testdata119.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata119.yml
@@ -41,3 +41,21 @@ holders:
 authors:
   - Masayuki Hatta (mhatta)
   - artofcode LLC. http://artofcode.com
+allrights:
+  - Copyright (c) Artifex Software Inc., All Rights Reserved.
+  - copyright Adobe Systems Incorporated
+  - Copyright (c) 1997-2002 Graeme W. Gill
+  - Copyright (c) 1999-2000 Image Power, Inc.
+  - Copyright (c) 1999-2000 The University of British Columbia
+  - Copyright (c) 2001-2003 Michael David Adams
+  - copyright (c) 1991-1998, Thomas G. Lane. All Rights Reserved
+  - copyright holder, Aladdin Enterprises of Menlo Park
+  - copyright by the Free Software Foundation
+  - copyright by M.I.T.
+  - Copyright property of CompuServe Incorporated.
+  - Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson
+  - Copyright (c) 2000-2002 Glenn Randers-Pehrson
+  - Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+  - Copyright (c) 1996, 1997 Andreas Dilger
+  - Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+  - Copyright (c) 1995-2005 Jean-loup Gailly and Mark Adler
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata12.yml b/tests/cluecode/data/copyright_fossology/testdata12.yml
index 1a35101b98..5e63785b99 100644
--- a/tests/cluecode/data/copyright_fossology/testdata12.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata12.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2005 DMTF.
 holders:
   - DMTF
+allrights:
+  - Copyright (c) 2005 DMTF. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata120.yml b/tests/cluecode/data/copyright_fossology/testdata120.yml
index 2100066b05..5d793a89d9 100644
--- a/tests/cluecode/data/copyright_fossology/testdata120.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata120.yml
@@ -20,3 +20,10 @@ authors:
   - Sebastian Kuzminsky <seb@highlab.com>
   - Gerrit Pape <pape@smarden.org>
   - Andres Salomon <dilinger@debian.org>
+allrights:
+  - Copyright (c) 2005-2008, Linus Torvalds and others.
+  - Copyright (c) 1995-1999, Cryptography Research, Inc.
+  - Copyright (c) 2003-2006, Davide Libenzi, Johannes E. Schindelin
+  - Copyright (c) 2005, Sebastian Kuzminsky <seb@highlab.com>
+  - (c) 2005-2006, Andres Salomon <dilinger@debian.org>
+  - (c) 2005-2008, Gerrit Pape <pape@smarden.org>
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata121.yml b/tests/cluecode/data/copyright_fossology/testdata121.yml
index 2100066b05..5d793a89d9 100644
--- a/tests/cluecode/data/copyright_fossology/testdata121.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata121.yml
@@ -20,3 +20,10 @@ authors:
   - Sebastian Kuzminsky <seb@highlab.com>
   - Gerrit Pape <pape@smarden.org>
   - Andres Salomon <dilinger@debian.org>
+allrights:
+  - Copyright (c) 2005-2008, Linus Torvalds and others.
+  - Copyright (c) 1995-1999, Cryptography Research, Inc.
+  - Copyright (c) 2003-2006, Davide Libenzi, Johannes E. Schindelin
+  - Copyright (c) 2005, Sebastian Kuzminsky <seb@highlab.com>
+  - (c) 2005-2006, Andres Salomon <dilinger@debian.org>
+  - (c) 2005-2008, Gerrit Pape <pape@smarden.org>
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata122.yml b/tests/cluecode/data/copyright_fossology/testdata122.yml
index 2100066b05..5d793a89d9 100644
--- a/tests/cluecode/data/copyright_fossology/testdata122.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata122.yml
@@ -20,3 +20,10 @@ authors:
   - Sebastian Kuzminsky <seb@highlab.com>
   - Gerrit Pape <pape@smarden.org>
   - Andres Salomon <dilinger@debian.org>
+allrights:
+  - Copyright (c) 2005-2008, Linus Torvalds and others.
+  - Copyright (c) 1995-1999, Cryptography Research, Inc.
+  - Copyright (c) 2003-2006, Davide Libenzi, Johannes E. Schindelin
+  - Copyright (c) 2005, Sebastian Kuzminsky <seb@highlab.com>
+  - (c) 2005-2006, Andres Salomon <dilinger@debian.org>
+  - (c) 2005-2008, Gerrit Pape <pape@smarden.org>
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata123.yml b/tests/cluecode/data/copyright_fossology/testdata123.yml
index 519dc39439..46ac21abbd 100644
--- a/tests/cluecode/data/copyright_fossology/testdata123.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata123.yml
@@ -8,3 +8,6 @@ copyrights:
 holders:
   - Free Software Foundation, Inc.
   - James Troup
+allrights:
+  - Copyright (c) 1998-2008 Free Software Foundation, Inc.
+  - Copyright (c) 1998-2006 James Troup.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata124.yml b/tests/cluecode/data/copyright_fossology/testdata124.yml
index 519dc39439..46ac21abbd 100644
--- a/tests/cluecode/data/copyright_fossology/testdata124.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata124.yml
@@ -8,3 +8,6 @@ copyrights:
 holders:
   - Free Software Foundation, Inc.
   - James Troup
+allrights:
+  - Copyright (c) 1998-2008 Free Software Foundation, Inc.
+  - Copyright (c) 1998-2006 James Troup.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata126.yml b/tests/cluecode/data/copyright_fossology/testdata126.yml
index 4f0454d003..43ca2c95be 100644
--- a/tests/cluecode/data/copyright_fossology/testdata126.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata126.yml
@@ -24,3 +24,10 @@ authors:
   - James Clark (jjc@jclark.com)
   - Joergen Haegg (jh@axis.se)
   - the University of California, Berkeley
+allrights:
+  - Copyright (c) 1989-2000 Free Software Foundation, Inc.
+  - copyrighted by MIT
+  - Copyright 1991 Massachusetts Institute of Technology
+  - Copyright (c) 1994-2000, 2001, 2002 Free Software Foundation, Inc.
+  - Copyright (c) 2000 Free Software Foundation, Inc.
+  - Copyright (c) 1986 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata127.yml b/tests/cluecode/data/copyright_fossology/testdata127.yml
index 792fb7e8e5..7b1d5d46aa 100644
--- a/tests/cluecode/data/copyright_fossology/testdata127.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata127.yml
@@ -9,3 +9,5 @@ holders:
 authors:
   - Masayuki Hatta (mhatta)
   - URW++ Design & Development GmbH Valek Filippov <frob@df.ru>
+allrights:
+  - Copyright (c) 2001- Valek Filippov, All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata128.yml b/tests/cluecode/data/copyright_fossology/testdata128.yml
index 86430175b6..554c04bd7f 100644
--- a/tests/cluecode/data/copyright_fossology/testdata128.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata128.yml
@@ -41,3 +41,21 @@ holders:
 authors:
   - Masayuki Hatta (mhatta)
   - artofcode LLC. http://artofcode.com
+allrights:
+  - Copyright (c) Artifex Software Inc., All Rights Reserved.
+  - copyright Adobe Systems Incorporated
+  - Copyright (c) 1997-2002 Graeme W. Gill
+  - Copyright (c) 1999-2000 Image Power, Inc.
+  - Copyright (c) 1999-2000 The University of British Columbia
+  - Copyright (c) 2001-2003 Michael David Adams
+  - copyright (c) 1991-1998, Thomas G. Lane. All Rights Reserved
+  - copyright holder, Aladdin Enterprises of Menlo Park
+  - copyright by the Free Software Foundation
+  - copyright by M.I.T.
+  - Copyright property of CompuServe Incorporated.
+  - Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson
+  - Copyright (c) 2000-2002 Glenn Randers-Pehrson
+  - Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+  - Copyright (c) 1996, 1997 Andreas Dilger
+  - Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+  - Copyright (c) 1995-2005 Jean-loup Gailly and Mark Adler
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata132.yml b/tests/cluecode/data/copyright_fossology/testdata132.yml
index 8047adfaa0..af82c43a9e 100644
--- a/tests/cluecode/data/copyright_fossology/testdata132.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata132.yml
@@ -8,3 +8,5 @@ holders:
   - Anthony Towns
 authors:
   - Anthony Towns <ajt@debian.org>
+allrights:
+  - Copyright (c) 1999, Anthony Towns. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata133.yml b/tests/cluecode/data/copyright_fossology/testdata133.yml
index 4c0c883c65..0d5748f4cb 100644
--- a/tests/cluecode/data/copyright_fossology/testdata133.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata133.yml
@@ -27,3 +27,14 @@ holders:
 authors:
   - Scott K. Ellis scott@debian.org
   - John Cristy
+allrights:
+  - Copyright 1999-2004 ImageMagick Studio LLC
+  - copyright Pineapple USA Inc.
+  - Copyright 1999 E. I. du Pont de Nemours and Company
+  - Copyright (c) 2002 GraphicsMagick Group
+  - Copyright (c) 2000-2002, Ghostgum Software Pty Ltd. All rights reserved.
+  - Copyright (c) 2000 Markus Friedl. All rights reserved.
+  - Copyright 1999 - 2003 Bob Friesenhahn
+  - Copyright (c) 1985-1988 by Supoj Sutanthavibul
+  - Parts Copyright (c) 1989-2000 by Brian V. Smith
+  - Parts Copyright (c) 1991 by Paul King
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata135.yml b/tests/cluecode/data/copyright_fossology/testdata135.yml
index 21ac71da92..e53b36bfd9 100644
--- a/tests/cluecode/data/copyright_fossology/testdata135.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata135.yml
@@ -7,3 +7,5 @@ copyrights:
     project
 holders:
   - Miquel van Smoorenburg and the members pkg-sysvinit project
+allrights:
+  - Copyright 1997-2005 Miquel van Smoorenburg <miquels@cistron.nl> and the members pkg-sysvinit project.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata136.yml b/tests/cluecode/data/copyright_fossology/testdata136.yml
index 97612d3db9..ea60779bc2 100644
--- a/tests/cluecode/data/copyright_fossology/testdata136.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata136.yml
@@ -8,3 +8,6 @@ copyrights:
 holders:
   - Free Software Foundation
   - Eazel, Inc
+allrights:
+  - Copyright (c) 2000-2003 Free Software Foundation.
+  - Copyright (c) 2000, 2001 Eazel, Inc
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata138.yml b/tests/cluecode/data/copyright_fossology/testdata138.yml
index 481709f34b..e4db4fa852 100644
--- a/tests/cluecode/data/copyright_fossology/testdata138.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata138.yml
@@ -13,3 +13,6 @@ authors:
   - Noah Meyerhans <noahm@debian.org>
   - Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
   - Sun Microsystems, Inc.
+allrights:
+  - Copyright (c) 1989 The Regents of the University of California. All rights reserved.
+  - copyright Alexey Kuznetsov
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata139.yml b/tests/cluecode/data/copyright_fossology/testdata139.yml
index 653da0150c..07c9231306 100644
--- a/tests/cluecode/data/copyright_fossology/testdata139.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata139.yml
@@ -28,3 +28,14 @@ authors:
   - Jack Moffitt <jack@xiph.org>
   - Fernando Perez <fperez@colorado.edu> , Janko Hauser <jhauser@zscout.de> , Nathaniel Gray
     <n8gray@caltech.edu>
+allrights:
+  - Copyright (c) 2001, 2002, 2003, 2004 Fernando Perez <fperez@colorado.edu>
+  - Copyright (c) 2001 Janko Hauser <jhauser@zscout.de> and Nathaniel Gray <n8gray@caltech.edu>
+  - Copyright (c) 2004 W.J. van der Laan <gnufnork@hetdigitalegat.nl>
+  - Copyright (c) 2004-2006 Fernando Perez <fperez@colorado.edu>
+  - Copyright Gael Varoquaux <gael.varoquaux@normalesup.org>
+  - Copyright (c) InQuant GmbH Stefan Eletzhofer <stefan.eletzhofer@inquant.de>
+  - Copyright (c) 2001 Bill Bumgarner <bbum@friday.com>
+  - Copyright (c) 2001 Python Software Foundation, www.python.org
+  - Copyright (c) 2005 Jorgen Stenarson <jorgen.stenarson@bostream.nu>
+  - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata14.yml b/tests/cluecode/data/copyright_fossology/testdata14.yml
index 6debcc4436..410fea114d 100644
--- a/tests/cluecode/data/copyright_fossology/testdata14.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata14.yml
@@ -8,3 +8,6 @@ copyrights:
 holders:
   - Trolltech ASA, Norway
   - trolltech.html Trolltech
+allrights:
+  - Copyright (c) 1999-2006 Trolltech ASA, Norway.
+  - Copyright (c) 2006 trolltech.html Trolltech
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata15.yml b/tests/cluecode/data/copyright_fossology/testdata15.yml
index 7dba1654fa..cf7c3e828f 100644
--- a/tests/cluecode/data/copyright_fossology/testdata15.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata15.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright 2009 The Apache Software Foundation
 holders:
   - The Apache Software Foundation
+allrights:
+  - Copyright 2009 The Apache Software Foundation.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata16.yml b/tests/cluecode/data/copyright_fossology/testdata16.yml
index d9eb817075..42ca0f5f31 100644
--- a/tests/cluecode/data/copyright_fossology/testdata16.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata16.yml
@@ -8,3 +8,6 @@ copyrights:
 holders:
   - The Open Group
   - Digital Equipment Corporation, Maynard, Massachusetts
+allrights:
+  - Copyright 1987, 1998 The Open Group
+  - Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata17.yml b/tests/cluecode/data/copyright_fossology/testdata17.yml
index a608bda71d..c4665e1921 100644
--- a/tests/cluecode/data/copyright_fossology/testdata17.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata17.yml
@@ -9,3 +9,6 @@ copyrights:
 holders:
   - Free Software Foundation, Inc.
   - Sun Microsystems, Inc.
+allrights:
+  - Copyright (c) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+  - Copyright 2005 Sun Microsystems, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata18.yml b/tests/cluecode/data/copyright_fossology/testdata18.yml
index 3d619ffd0a..236041b2e4 100644
--- a/tests/cluecode/data/copyright_fossology/testdata18.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata18.yml
@@ -12,3 +12,8 @@ holders:
   - Const Kaplinsky
   - Tridia Corporation
   - AT&T Laboratories Cambridge
+allrights:
+  - Copyright (c) 2002 Tim Jansen. All Rights Reserved.
+  - Copyright (c) 2000, 2001 Const Kaplinsky. All Rights Reserved.
+  - Copyright (c) 2000 Tridia Corporation. All Rights Reserved.
+  - Copyright (c) 1999 AT&T Laboratories Cambridge. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata20.yml b/tests/cluecode/data/copyright_fossology/testdata20.yml
index 4da8ebaa74..27707946c4 100644
--- a/tests/cluecode/data/copyright_fossology/testdata20.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata20.yml
@@ -10,3 +10,6 @@ holders:
   - Akihiro MOTOKI
 authors:
   - Akihiro MOTOKI <amotoki@dd.iij4u.or.jp>
+allrights:
+  - Copyright 2002 Walter Harms (walter.harms@informatik.uni-oldenburg.de)
+  - Copyright (c) 2003 Akihiro MOTOKI all rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata22.yml b/tests/cluecode/data/copyright_fossology/testdata22.yml
index e7a1643666..d19914f809 100644
--- a/tests/cluecode/data/copyright_fossology/testdata22.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata22.yml
@@ -6,3 +6,5 @@ copyrights:
   - Portions created by the Initial Developer are Copyright (c) 1998-1999 the Initial Developer
 holders:
   - the Initial Developer
+allrights:
+  - Portions created by the Initial Developer are Copyright (c) 1998-1999 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata26.yml b/tests/cluecode/data/copyright_fossology/testdata26.yml
index 6f87062700..75d8a68056 100644
--- a/tests/cluecode/data/copyright_fossology/testdata26.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata26.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright 1996-2000, 2003, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg
 holders:
   - David Turner, Robert Wilhelm, and Werner Lemberg
+allrights:
+  - Copyright 1996-2000, 2003, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata27.yml b/tests/cluecode/data/copyright_fossology/testdata27.yml
index b550b430f2..8438603cf7 100644
--- a/tests/cluecode/data/copyright_fossology/testdata27.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata27.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2001-2008 Apache Software Foundation
 holders:
   - Apache Software Foundation
+allrights:
+  - Copyright (c) 2001-2008 Apache Software Foundation. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata29.yml b/tests/cluecode/data/copyright_fossology/testdata29.yml
index 92f7b28182..29a1f71e92 100644
--- a/tests/cluecode/data/copyright_fossology/testdata29.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata29.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright 2001 Sun Microsystems, Inc.
 holders:
   - Sun Microsystems, Inc.
+allrights:
+  - Copyright 2001 Sun Microsystems, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata33.yml b/tests/cluecode/data/copyright_fossology/testdata33.yml
index fc554887af..12df9753e5 100644
--- a/tests/cluecode/data/copyright_fossology/testdata33.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata33.yml
@@ -8,3 +8,6 @@ copyrights:
 holders:
   - Adobe Systems Incorporated
   - Adobe Systems Incorporated
+allrights:
+  - Copyright 1999 Adobe Systems Incorporated. All Rights Reserved.
+  - Copyright (c) 1999 Adobe Systems Incorporated. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata35.yml b/tests/cluecode/data/copyright_fossology/testdata35.yml
index 18c62aaa77..0ae3200c52 100644
--- a/tests/cluecode/data/copyright_fossology/testdata35.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata35.yml
@@ -67,3 +67,31 @@ authors:
   - Philip Hazel <ph10@cam.ac.uk>
   - Philip Hazel
   - Adam Twiss (adam@zeus.co.uk)
+allrights:
+  - Copyright (c) 1996-1997 Cisco Systems, Inc.
+  - Copyright (c) Ian F. Darwin, 1987.
+  - copyright 1992 by Eric Haines, erich@eye.com
+  - Copyright (c) 1995, Board of Trustees of the University of Illinois
+  - Copyright (c) 1994, Jeff Hostetler, Spyglass, Inc.
+  - Copyright (c) 1993, 1994 by Carnegie Mellon University
+  - Copyright (c) 1991 Bell Communications Research, Inc.
+  - (c) Copyright 1993,1994 by Carnegie Mellon University All Rights Reserved.
+  - Copyright (c) 1991 Bell Communications Research, Inc.
+  - Copyright RSA Data Security, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - Copyright RSA Data Security, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - copyright RSA Data Security, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - copyright RSA Data Security, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - Copyright (c) 2000-2002 The Apache Software Foundation. All rights reserved.
+  - copyright RSA Data Security, Inc.
+  - Copyright (c) 1990-2, RSA Data Security, Inc.
+  - Copyright 1991 by the Massachusetts Institute of Technology
+  - Copyright 1991 by the Massachusetts Institute of Technology
+  - Copyright (c) 1997-2001 University of Cambridge
+  - copyright by the University of Cambridge, England.
+  - Copyright (c) Zeus Technology Limited 1996.
+  - Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper
+  - copyright of Pete Harlow
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata36.yml b/tests/cluecode/data/copyright_fossology/testdata36.yml
index 18c62aaa77..0ae3200c52 100644
--- a/tests/cluecode/data/copyright_fossology/testdata36.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata36.yml
@@ -67,3 +67,31 @@ authors:
   - Philip Hazel <ph10@cam.ac.uk>
   - Philip Hazel
   - Adam Twiss (adam@zeus.co.uk)
+allrights:
+  - Copyright (c) 1996-1997 Cisco Systems, Inc.
+  - Copyright (c) Ian F. Darwin, 1987.
+  - copyright 1992 by Eric Haines, erich@eye.com
+  - Copyright (c) 1995, Board of Trustees of the University of Illinois
+  - Copyright (c) 1994, Jeff Hostetler, Spyglass, Inc.
+  - Copyright (c) 1993, 1994 by Carnegie Mellon University
+  - Copyright (c) 1991 Bell Communications Research, Inc.
+  - (c) Copyright 1993,1994 by Carnegie Mellon University All Rights Reserved.
+  - Copyright (c) 1991 Bell Communications Research, Inc.
+  - Copyright RSA Data Security, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - Copyright RSA Data Security, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - copyright RSA Data Security, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - copyright RSA Data Security, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - Copyright (c) 2000-2002 The Apache Software Foundation. All rights reserved.
+  - copyright RSA Data Security, Inc.
+  - Copyright (c) 1990-2, RSA Data Security, Inc.
+  - Copyright 1991 by the Massachusetts Institute of Technology
+  - Copyright 1991 by the Massachusetts Institute of Technology
+  - Copyright (c) 1997-2001 University of Cambridge
+  - copyright by the University of Cambridge, England.
+  - Copyright (c) Zeus Technology Limited 1996.
+  - Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper
+  - copyright of Pete Harlow
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata37.yml b/tests/cluecode/data/copyright_fossology/testdata37.yml
index 18c62aaa77..0ae3200c52 100644
--- a/tests/cluecode/data/copyright_fossology/testdata37.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata37.yml
@@ -67,3 +67,31 @@ authors:
   - Philip Hazel <ph10@cam.ac.uk>
   - Philip Hazel
   - Adam Twiss (adam@zeus.co.uk)
+allrights:
+  - Copyright (c) 1996-1997 Cisco Systems, Inc.
+  - Copyright (c) Ian F. Darwin, 1987.
+  - copyright 1992 by Eric Haines, erich@eye.com
+  - Copyright (c) 1995, Board of Trustees of the University of Illinois
+  - Copyright (c) 1994, Jeff Hostetler, Spyglass, Inc.
+  - Copyright (c) 1993, 1994 by Carnegie Mellon University
+  - Copyright (c) 1991 Bell Communications Research, Inc.
+  - (c) Copyright 1993,1994 by Carnegie Mellon University All Rights Reserved.
+  - Copyright (c) 1991 Bell Communications Research, Inc.
+  - Copyright RSA Data Security, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - Copyright RSA Data Security, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - copyright RSA Data Security, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - copyright RSA Data Security, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - Copyright (c) 2000-2002 The Apache Software Foundation. All rights reserved.
+  - copyright RSA Data Security, Inc.
+  - Copyright (c) 1990-2, RSA Data Security, Inc.
+  - Copyright 1991 by the Massachusetts Institute of Technology
+  - Copyright 1991 by the Massachusetts Institute of Technology
+  - Copyright (c) 1997-2001 University of Cambridge
+  - copyright by the University of Cambridge, England.
+  - Copyright (c) Zeus Technology Limited 1996.
+  - Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper
+  - copyright of Pete Harlow
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata39.yml b/tests/cluecode/data/copyright_fossology/testdata39.yml
index 18c62aaa77..0ae3200c52 100644
--- a/tests/cluecode/data/copyright_fossology/testdata39.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata39.yml
@@ -67,3 +67,31 @@ authors:
   - Philip Hazel <ph10@cam.ac.uk>
   - Philip Hazel
   - Adam Twiss (adam@zeus.co.uk)
+allrights:
+  - Copyright (c) 1996-1997 Cisco Systems, Inc.
+  - Copyright (c) Ian F. Darwin, 1987.
+  - copyright 1992 by Eric Haines, erich@eye.com
+  - Copyright (c) 1995, Board of Trustees of the University of Illinois
+  - Copyright (c) 1994, Jeff Hostetler, Spyglass, Inc.
+  - Copyright (c) 1993, 1994 by Carnegie Mellon University
+  - Copyright (c) 1991 Bell Communications Research, Inc.
+  - (c) Copyright 1993,1994 by Carnegie Mellon University All Rights Reserved.
+  - Copyright (c) 1991 Bell Communications Research, Inc.
+  - Copyright RSA Data Security, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - Copyright RSA Data Security, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - copyright RSA Data Security, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - copyright RSA Data Security, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - Copyright (c) 2000-2002 The Apache Software Foundation. All rights reserved.
+  - copyright RSA Data Security, Inc.
+  - Copyright (c) 1990-2, RSA Data Security, Inc.
+  - Copyright 1991 by the Massachusetts Institute of Technology
+  - Copyright 1991 by the Massachusetts Institute of Technology
+  - Copyright (c) 1997-2001 University of Cambridge
+  - copyright by the University of Cambridge, England.
+  - Copyright (c) Zeus Technology Limited 1996.
+  - Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper
+  - copyright of Pete Harlow
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata4.yml b/tests/cluecode/data/copyright_fossology/testdata4.yml
index 10d1fac5ec..a140a6ce02 100644
--- a/tests/cluecode/data/copyright_fossology/testdata4.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata4.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 1990-1999 Info-ZIP.
 holders:
   - Info-ZIP
+allrights:
+  - Copyright (c) 1990-1999 Info-ZIP. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata40.yml b/tests/cluecode/data/copyright_fossology/testdata40.yml
index 7567688edd..3f1da189a0 100644
--- a/tests/cluecode/data/copyright_fossology/testdata40.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata40.yml
@@ -9,3 +9,5 @@ holders:
 authors:
   - Marc Haber <mh+debian-packages@zugschlus.de>
   - Adel I. Mirzazhanov <a-del@iname.com>
+allrights:
+  - Copyright (c) 1999, 2000, 2001 Adel I. Mirzazhanov. All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata41.yml b/tests/cluecode/data/copyright_fossology/testdata41.yml
index 126c0ab818..9d0d9503ed 100644
--- a/tests/cluecode/data/copyright_fossology/testdata41.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata41.yml
@@ -8,3 +8,5 @@ holders:
   - Jason Gunthorpe and others
 authors:
   - APT Development Team <deity@lists.debian.org>
+allrights:
+  - copyright 1997, 1998, 1999 Jason Gunthorpe and others.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata43.yml b/tests/cluecode/data/copyright_fossology/testdata43.yml
index 126c0ab818..9d0d9503ed 100644
--- a/tests/cluecode/data/copyright_fossology/testdata43.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata43.yml
@@ -8,3 +8,5 @@ holders:
   - Jason Gunthorpe and others
 authors:
   - APT Development Team <deity@lists.debian.org>
+allrights:
+  - copyright 1997, 1998, 1999 Jason Gunthorpe and others.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata44.yml b/tests/cluecode/data/copyright_fossology/testdata44.yml
index 80923b2c93..1e69519009 100644
--- a/tests/cluecode/data/copyright_fossology/testdata44.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata44.yml
@@ -11,3 +11,6 @@ holders:
 authors:
   - Ian Murdock <imurdock@debian.org> and Bruce Perens <bruce@pixar.com>
   - Bruce Perens <Bruce@Pixar.com>
+allrights:
+  - copyrighted by the Free Software Foundation, Inc.
+  - Copyright (c) 1995-2008 Software in the Public Interest.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata46.yml b/tests/cluecode/data/copyright_fossology/testdata46.yml
index 76689d89e0..65f70b9211 100644
--- a/tests/cluecode/data/copyright_fossology/testdata46.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata46.yml
@@ -51,3 +51,24 @@ authors:
   - the University of California, Berkeley and its contributors
   - Richard Verhoeven
   - chet@po.cwru.edu
+allrights:
+  - Copyright (c) 1989-2006 Free Software Foundation, Inc.
+  - Copyright FSF
+  - Copyright 1995-2005 by Chester Ramey.
+  - Copyright (c) 1988-2005 Free Software Foundation, Inc.
+  - Copyright (c) 1993-1994 O'Reilly and Associates, Inc.
+  - Copyright (c) 1998, 1999, 2001 Gary V. Vaughan <gvv@techie.com>
+  - Copyright (c) 1991 Simon J. Gerraty
+  - Kaz Kylheku Copyright 1999
+  - Copyright (c) Chris Robertson
+  - copyright chris ulrich
+  - Copyright (c) 1994 Winning Strategies, Inc. All rights reserved.
+  - Copyright (c) 1989, 1993 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 1988-2004 Free Software Foundation, Inc.
+  - Copyright (c) 1988-2005 Free Software Foundation, Inc.
+  - Copyright (c) 1988-2005 Free Software Foundation, Inc.
+  - Copyright (c) 1988-2002 Free Software Foundation, Inc.
+  - Copyright (c) 1983, 1990, 1993 The Regents of the University of California. All rights reserved.
+  - Portions Copyright (c) 1993 by Digital Equipment Corporation.
+  - Copyright (c) 1988 Free Software Foundation, Inc.
+  - Copyright (c) 1999, 2002 Aladdin Enterprises. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata47.yml b/tests/cluecode/data/copyright_fossology/testdata47.yml
index 2970a0e6a5..ddab2ef871 100644
--- a/tests/cluecode/data/copyright_fossology/testdata47.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata47.yml
@@ -9,3 +9,5 @@ holders:
 authors:
   - Bdale Garbee <bdale@gag.com>
   - Internet Software Consortium
+allrights:
+  - Copyright (c) 1996-2001 Internet Software Consortium.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata48.yml b/tests/cluecode/data/copyright_fossology/testdata48.yml
index 2970a0e6a5..ddab2ef871 100644
--- a/tests/cluecode/data/copyright_fossology/testdata48.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata48.yml
@@ -9,3 +9,5 @@ holders:
 authors:
   - Bdale Garbee <bdale@gag.com>
   - Internet Software Consortium
+allrights:
+  - Copyright (c) 1996-2001 Internet Software Consortium.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata49.yml b/tests/cluecode/data/copyright_fossology/testdata49.yml
index 2970a0e6a5..ddab2ef871 100644
--- a/tests/cluecode/data/copyright_fossology/testdata49.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata49.yml
@@ -9,3 +9,5 @@ holders:
 authors:
   - Bdale Garbee <bdale@gag.com>
   - Internet Software Consortium
+allrights:
+  - Copyright (c) 1996-2001 Internet Software Consortium.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata5.yml b/tests/cluecode/data/copyright_fossology/testdata5.yml
index a545a395be..980f07ce36 100644
--- a/tests/cluecode/data/copyright_fossology/testdata5.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata5.yml
@@ -6,3 +6,5 @@ copyrights:
   - (c) Copyright 2000
 authors:
   - Antoine P. Petitet
+allrights:
+  - (c) Copyright 2000 All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata52.yml b/tests/cluecode/data/copyright_fossology/testdata52.yml
index 52e26d034b..31160eaa36 100644
--- a/tests/cluecode/data/copyright_fossology/testdata52.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata52.yml
@@ -9,3 +9,5 @@ holders:
 authors:
   - Loic Prylli <lprylli@graville.fdn.fr>
   - Robert Luberda <robert@debian.org>
+allrights:
+  - Copyright (c) 1980, 1993 The Regents of the University of California.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata53.yml b/tests/cluecode/data/copyright_fossology/testdata53.yml
index 79d3547442..06bfe9f946 100644
--- a/tests/cluecode/data/copyright_fossology/testdata53.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata53.yml
@@ -11,3 +11,5 @@ authors:
   - Ian Murdock <imurdock@gnu.ai.mit.edu>
   - Charles Briscoe-Smith <cpbs@debian.org>
   - Graham Wilson <bob@decoy.wox.org>
+allrights:
+  - Copyright (c) The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata56.yml b/tests/cluecode/data/copyright_fossology/testdata56.yml
index 8e21f1fcdb..95361ceab3 100644
--- a/tests/cluecode/data/copyright_fossology/testdata56.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata56.yml
@@ -14,3 +14,7 @@ authors:
   - Philippe Troin <phil@fifi.org>
   - Anibal Monsalve Salazar <anibal@debian.org>
   - Julian Seward <jseward@acm.org>
+allrights:
+  - Copyright (c) 1999, 2000, 2001, 2002 Philippe Troin <phil@fifi.org>
+  - Copyright (c) 2004-2007 Anibal Monsalve Salazar.
+  - copyright (c) 1996-2007 Julian R Seward. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata58.yml b/tests/cluecode/data/copyright_fossology/testdata58.yml
index c691696f76..c596227229 100644
--- a/tests/cluecode/data/copyright_fossology/testdata58.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata58.yml
@@ -10,3 +10,6 @@ holders:
   - Netscape Communications Corporation
 authors:
   - Fumitoshi UKAI <ukai@debian.or.jp>
+allrights:
+  - Copyright (c) 2001-2003 Fumitoshi UKAI
+  - Copyright (c) 1994-2000 Netscape Communications Corporation. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata61.yml b/tests/cluecode/data/copyright_fossology/testdata61.yml
index 9a23ff9362..b588a42755 100644
--- a/tests/cluecode/data/copyright_fossology/testdata61.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata61.yml
@@ -45,3 +45,23 @@ holders:
 authors:
   - Michael Stone <mstone@debian.org>
   - Michael Stone <mstone@debian.org>
+allrights:
+  - Copyright (c) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+  - Copyright (c) 1990, 1993, 1994 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+  - Copyright (c) 1989, 1993 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 1999-2006 Free Software Foundation, Inc.
+  - Copyright (c) 1997, 1998, 1999 Colin Plumb.
+  - Copyright (c) 2005, 2006 Free Software Foundation, Inc.
+  - Copyright (c) 1996-1999 by Internet Software Consortium.
+  - Copyright (c) 2004, 2006, 2007 Free Software Foundation, Inc.
+  - Copyright (c) 1997-2007 Free Software Foundation, Inc.
+  - Copyright (c) 1984 David M. Ihnat
+  - Copyright (c) 1996-2007 Free Software Foundation, Inc.
+  - Copyright (c) 1994, 1995, 1997, 1998, 1999, 2000 H. Peter Anvin
+  - Copyright (c) 1997-2005 Free Software Foundation, Inc.
+  - Copyright (c) 1984 David M. Ihnat
+  - Copyright (c) 1999-2007 Free Software Foundation, Inc.
+  - Copyright (c) 1997, 1998, 1999 Colin Plumb.
+  - Copyright 1994-1996, 2000-2008 Free Software Foundation, Inc.
+  - Copyright (c) 1984-2008 Free Software Foundation, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata7.yml b/tests/cluecode/data/copyright_fossology/testdata7.yml
index c5029692da..572fd702ae 100644
--- a/tests/cluecode/data/copyright_fossology/testdata7.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata7.yml
@@ -12,3 +12,8 @@ holders:
   - Apple Inc.
   - Cameron Zwarich
   - Maks Orlovich
+allrights:
+  - Copyright (c) 1999-2000 Harri Porten (porten@kde.org)
+  - Copyright (c) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+  - Copyright (c) 2007 Cameron Zwarich (cwzwarich@uwaterloo.ca)
+  - Copyright (c) 2007 Maks Orlovich
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata72.yml b/tests/cluecode/data/copyright_fossology/testdata72.yml
index ff9f369f0e..68fdf564a6 100644
--- a/tests/cluecode/data/copyright_fossology/testdata72.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata72.yml
@@ -10,3 +10,6 @@ holders:
   - The NetBSD Foundation, Inc.
 authors:
   - the NetBSD Foundation, Inc. and its contributors
+allrights:
+  - Copyright (c) 2000, 2001, 2006 Debian.
+  - Copyright (c) 1999 The NetBSD Foundation, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata73.yml b/tests/cluecode/data/copyright_fossology/testdata73.yml
index bd4cdba584..80b2bee35a 100644
--- a/tests/cluecode/data/copyright_fossology/testdata73.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata73.yml
@@ -19,3 +19,10 @@ holders:
 authors:
   - Sean M. Burke
   - Javier Fernandez-Sanguino
+allrights:
+  - Copyright 1988,1990,1993,1994 by Paul Vixie All rights reserved
+  - Copyright 1994 Ian Jackson
+  - Copyright (c) 1994 Ian Jackson
+  - Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Steve Greenland
+  - Copyright 2001 Sean M. Burke
+  - Copyright 2006 Javier Fernandez-Sanguino
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata75.yml b/tests/cluecode/data/copyright_fossology/testdata75.yml
index 1adb6164c7..910bf0b229 100644
--- a/tests/cluecode/data/copyright_fossology/testdata75.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata75.yml
@@ -15,3 +15,8 @@ holders:
 authors:
   - Mark W. Eichin eichin@kitten.gen.ma.us
   - Gerrit Pape <pape@smarden.org>
+allrights:
+  - Copyright (c) 1989-1994 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 1997 Christos Zoulas. All rights reserved.
+  - Copyright (c) 1997-2005 Herbert Xu <herbert@gondor.apana.org.au> All rights reserved.
+  - Copyright (c) 1992 Free Software Foundation, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata76.yml b/tests/cluecode/data/copyright_fossology/testdata76.yml
index e3db51d357..2410002107 100644
--- a/tests/cluecode/data/copyright_fossology/testdata76.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata76.yml
@@ -12,3 +12,7 @@ holders:
   - The President and Fellows of Harvard University
 authors:
   - Clint Adams <schizo@debian.org>
+allrights:
+  - Copyright (c) 1990,2007 Oracle. All rights reserved.
+  - Copyright (c) 1990, 1993, 1994, 1995 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 1995, 1996 The President and Fellows of Harvard University. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata77.yml b/tests/cluecode/data/copyright_fossology/testdata77.yml
index 35587ee836..1944f80d6e 100644
--- a/tests/cluecode/data/copyright_fossology/testdata77.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata77.yml
@@ -11,3 +11,6 @@ holders:
 authors:
   - sean finney <seanius@debian.org>
   - sean finney <seanius@debian.org>
+allrights:
+  - copyright (c) 2005 sean finney
+  - copyright (c) 2000-2004 Ola Lundqvist.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata89.yml b/tests/cluecode/data/copyright_fossology/testdata89.yml
index df281f93eb..f12b690e62 100644
--- a/tests/cluecode/data/copyright_fossology/testdata89.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata89.yml
@@ -8,3 +8,5 @@ holders:
   - Thomas E. Dickey
 authors:
   - Thomas E. Dickey <dickey@invisible-island.net>
+allrights:
+  - Copyright 1994-2001,2002 by Thomas E. Dickey All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata90.yml b/tests/cluecode/data/copyright_fossology/testdata90.yml
index a8703d75c5..fe335596ba 100644
--- a/tests/cluecode/data/copyright_fossology/testdata90.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata90.yml
@@ -13,3 +13,7 @@ holders:
 authors:
   - Barak Pearlmutter <bap@debian.org>
   - David Kreil <kreil@ebi.ac.uk>
+allrights:
+  - Copyright (c) 2002 Leon Bottou and Yann Le Cun.
+  - Copyright (c) 2001 AT&T
+  - Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata92.yml b/tests/cluecode/data/copyright_fossology/testdata92.yml
index 2970a0e6a5..ddab2ef871 100644
--- a/tests/cluecode/data/copyright_fossology/testdata92.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata92.yml
@@ -9,3 +9,5 @@ holders:
 authors:
   - Bdale Garbee <bdale@gag.com>
   - Internet Software Consortium
+allrights:
+  - Copyright (c) 1996-2001 Internet Software Consortium.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata93.yml b/tests/cluecode/data/copyright_fossology/testdata93.yml
index 7c3be9eabd..f97032e937 100644
--- a/tests/cluecode/data/copyright_fossology/testdata93.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata93.yml
@@ -31,3 +31,16 @@ holders:
 authors:
   - Daniel Leidert <daniel.leidert@wgdd.de>
   - Mark Johnson <mrj@debian.org>
+allrights:
+  - Copyright (c) 1999-2007 Norman Walsh.
+  - Copyright (c) 2003 Jiri Kosek.
+  - Copyright (c) 2004-2007 Steve Ball.
+  - Copyright (c) 2005-2007 The DocBook Project.
+  - Copyright (c) 2005 Michal Molhanec.
+  - Copyright (c) 2000 Bob Clary.
+  - Copyright (c) 2001 The Netscape Corporation.
+  - Copyright (c) 2003 The Netscape Corporation.
+  - Copyright (c) 1997 Michael Bostock (Netscape Communications).
+  - Copyright (c) 2001 Bob Clary (Netscape Communications).
+  - Copyright (c) 2001 Seth Dillingham (Macrobyte Resources).
+  - Copyright (c) 2002 Mark Filanowicz (Amdahl IT Services).
\ No newline at end of file
diff --git a/tests/cluecode/data/copyright_fossology/testdata97.yml b/tests/cluecode/data/copyright_fossology/testdata97.yml
index f77443a6c6..d8bce1ed77 100644
--- a/tests/cluecode/data/copyright_fossology/testdata97.yml
+++ b/tests/cluecode/data/copyright_fossology/testdata97.yml
@@ -14,3 +14,8 @@ holders:
   - Free Software Foundation, Inc.
 authors:
   - Matt Kraai <kraai@alumni.carnegiemellon.edu>
+allrights:
+  - Copyright (c) 1993, 1994 Andrew Moore, Talke Studio.
+  - Copyright (c) 2006, 2007 Antonio Diaz Diaz.
+  - Copyright (c) 1997-2007 James Troup.
+  - Copyright (c) 1993, 2006, 2007 Free Software Foundation, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/AliasDotCom_Website.html.yml b/tests/cluecode/data/copyrights/AliasDotCom_Website.html.yml
index f0a2ce85a2..37f52c1be9 100644
--- a/tests/cluecode/data/copyrights/AliasDotCom_Website.html.yml
+++ b/tests/cluecode/data/copyrights/AliasDotCom_Website.html.yml
@@ -5,3 +5,5 @@ copyrights:
   - Copyright (c) AliasDotCom Ltd.
 holders:
   - AliasDotCom Ltd.
+allrights:
+  - Copyright (c) AliasDotCom Ltd. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/AssemblyInfoCommon.cs.yml b/tests/cluecode/data/copyrights/AssemblyInfoCommon.cs.yml
index 5ed016a09e..083de61630 100644
--- a/tests/cluecode/data/copyrights/AssemblyInfoCommon.cs.yml
+++ b/tests/cluecode/data/copyrights/AssemblyInfoCommon.cs.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Microsoft
     count: 2
+allrights:
+  - Copyright (c) Microsoft Corporation. All rights reserved.
+  - Copyright (c) Microsoft Corporation. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/COPYRIGHT_madwifi-COPYRIGHT_madwifi.madwifi.yml b/tests/cluecode/data/copyrights/COPYRIGHT_madwifi-COPYRIGHT_madwifi.madwifi.yml
index aff285c3c1..38c56bf146 100644
--- a/tests/cluecode/data/copyrights/COPYRIGHT_madwifi-COPYRIGHT_madwifi.madwifi.yml
+++ b/tests/cluecode/data/copyrights/COPYRIGHT_madwifi-COPYRIGHT_madwifi.madwifi.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Sam Leffler, Errno Consulting, Atheros Communications, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros Communications, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/README-README.yml b/tests/cluecode/data/copyrights/README-README.yml
index 76555a8c37..e9050a0b8f 100644
--- a/tests/cluecode/data/copyrights/README-README.yml
+++ b/tests/cluecode/data/copyrights/README-README.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jouni Malinen and contributors
     count: 1
+allrights:
+  - Copyright (c) 2002-2006, Jouni Malinen <jkmaline@cc.hut.fi> and contributors All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/abc_loss_of_holder_c-c.c.yml b/tests/cluecode/data/copyrights/abc_loss_of_holder_c-c.c.yml
index cc1a53e4eb..9a64741c1f 100644
--- a/tests/cluecode/data/copyrights/abc_loss_of_holder_c-c.c.yml
+++ b/tests/cluecode/data/copyrights/abc_loss_of_holder_c-c.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: abc
     count: 1
+allrights:
+  - copyright abc 2001 all rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/acme_c-c.c.yml b/tests/cluecode/data/copyrights/acme_c-c.c.yml
index d0b0712430..0b7383b2dd 100644
--- a/tests/cluecode/data/copyrights/acme_c-c.c.yml
+++ b/tests/cluecode/data/copyrights/acme_c-c.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: ACME, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2000 ACME, Inc., All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/activefieldattribute_cs-ActiveFieldAttribute_cs.cs.yml b/tests/cluecode/data/copyrights/activefieldattribute_cs-ActiveFieldAttribute_cs.cs.yml
index 6ae5921568..b6bed81464 100644
--- a/tests/cluecode/data/copyrights/activefieldattribute_cs-ActiveFieldAttribute_cs.cs.yml
+++ b/tests/cluecode/data/copyrights/activefieldattribute_cs-ActiveFieldAttribute_cs.cs.yml
@@ -10,3 +10,5 @@ holders_summary:
   - value: Thomas Hansen
     count: 1
 notes: this is not correct and Web Applications should not be returned at all
+allrights:
+  - Copyright 2009 - Thomas Hansen thomas@ra-ajax.org.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/addr_c-addr_c.c.yml b/tests/cluecode/data/copyrights/addr_c-addr_c.c.yml
index df2647ced3..28cf4718e5 100644
--- a/tests/cluecode/data/copyrights/addr_c-addr_c.c.yml
+++ b/tests/cluecode/data/copyrights/addr_c-addr_c.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Jon Doe
     count: 1
+allrights:
+  - Copyright 1999 Cornell University. All rights reserved.
+  - Copyright 2000 Jon Doe. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/adobe-Adobe.yml b/tests/cluecode/data/copyrights/adobe-Adobe.yml
index ca8e9bddbb..8736e19784 100644
--- a/tests/cluecode/data/copyrights/adobe-Adobe.yml
+++ b/tests/cluecode/data/copyrights/adobe-Adobe.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Adobe Systems Incorporated
     count: 1
+allrights:
+  - Copyright (c) 2006 Adobe Systems Incorporated. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/adobe_flashplugin-adobe_flashplugin.label.yml b/tests/cluecode/data/copyrights/adobe_flashplugin-adobe_flashplugin.label.yml
index 120133ae5f..b1f23c6cdc 100644
--- a/tests/cluecode/data/copyrights/adobe_flashplugin-adobe_flashplugin.label.yml
+++ b/tests/cluecode/data/copyrights/adobe_flashplugin-adobe_flashplugin.label.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Takuo KITAME, Bart Martens, and Canonical, LTD
     count: 1
+allrights:
+  - Copyright (c) 1996 - 2008. Adobe Systems Incorporated. All Rights Reserved.
+  - (c) 2001-2009, Takuo KITAME, Bart Martens, and Canonical, LTD
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/adobe_license.txt.yml b/tests/cluecode/data/copyrights/adobe_license.txt.yml
index 3ca052af29..f08bb0d5a0 100644
--- a/tests/cluecode/data/copyrights/adobe_license.txt.yml
+++ b/tests/cluecode/data/copyrights/adobe_license.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Adobe Systems Incorporated
     count: 1
+allrights:
+  - Copyright 1990-2009 Adobe Systems Incorporated. Copyright All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/affiliates.txt.yml b/tests/cluecode/data/copyrights/affiliates.txt.yml
index ec55d16023..db9b651564 100644
--- a/tests/cluecode/data/copyrights/affiliates.txt.yml
+++ b/tests/cluecode/data/copyrights/affiliates.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: HERE Global B.V. and its affiliate(s)
     count: 1
+allrights:
+  - Copyright (c) 2016-2018 HERE Global B.V. and its affiliate(s).
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/afl_v3_0-AFL_v.0.yml b/tests/cluecode/data/copyrights/afl_v3_0-AFL_v.0.yml
index 44fd30660b..13cf9f8c47 100644
--- a/tests/cluecode/data/copyrights/afl_v3_0-AFL_v.0.yml
+++ b/tests/cluecode/data/copyrights/afl_v3_0-AFL_v.0.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Lawrence Rosen
     count: 1
+allrights:
+  - Copyright (c) 2005 Lawrence Rosen.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/aladdin_free_public_license-Aladdin_Free_Public_License.yml b/tests/cluecode/data/copyrights/aladdin_free_public_license-Aladdin_Free_Public_License.yml
index 57aad5b643..8abcc96bbb 100644
--- a/tests/cluecode/data/copyrights/aladdin_free_public_license-Aladdin_Free_Public_License.yml
+++ b/tests/cluecode/data/copyrights/aladdin_free_public_license-Aladdin_Free_Public_License.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Aladdin Enterprises, Menlo Park, California, U.S.A.
     count: 1
+allrights:
+  - Copyright (c) 1994, 1995, 1997, 1998, 1999, 2000 Aladdin Enterprises, Menlo Park, California, U.S.A. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/alt.txt.yml b/tests/cluecode/data/copyrights/alt.txt.yml
index f2f8440d12..1fc26467f8 100644
--- a/tests/cluecode/data/copyrights/alt.txt.yml
+++ b/tests/cluecode/data/copyrights/alt.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Alt Three Services Limited
     count: 1
+allrights:
+  - Copyright (c) 2015-2018 Alt Three Services Limited. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/and_authors_mixed.txt.yml b/tests/cluecode/data/copyrights/and_authors_mixed.txt.yml
index c0832d78ba..cea3d7e7ad 100644
--- a/tests/cluecode/data/copyrights/and_authors_mixed.txt.yml
+++ b/tests/cluecode/data/copyrights/and_authors_mixed.txt.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1998 Softweyr LLC. All rights reserved.
+  - Copyright (c) 1988, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/and_the_contributors.txt.yml b/tests/cluecode/data/copyrights/and_the_contributors.txt.yml
index 0ed8c25304..bdf232d0e2 100644
--- a/tests/cluecode/data/copyrights/and_the_contributors.txt.yml
+++ b/tests/cluecode/data/copyrights/and_the_contributors.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: AstaXie and The Contributors
     count: 1
+allrights:
+  - Copyright (c) 2012, AstaXie and The Contributors All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/andre_darcy-c.c.yml b/tests/cluecode/data/copyrights/andre_darcy-c.c.yml
index f2586a98f0..dca047ee56 100644
--- a/tests/cluecode/data/copyrights/andre_darcy-c.c.yml
+++ b/tests/cluecode/data/copyrights/andre_darcy-c.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Pascal Andre
     count: 1
+allrights:
+  - Copyright (c) 1995, Pascal Andre (andre@via.ecp.fr).
+  - copyright 1997, 1998, 1999 by D'Arcy J.M. Cain (darcy@druid.net)
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/android_c-c.c.yml b/tests/cluecode/data/copyrights/android_c-c.c.yml
index 29aef713b0..3f998ec328 100644
--- a/tests/cluecode/data/copyrights/android_c-c.c.yml
+++ b/tests/cluecode/data/copyrights/android_c-c.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Colin Percival
     count: 1
+allrights:
+  - Copyright (c) 2009 The Android Open Source Project
+  - Copyright 2003-2005 Colin Percival All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/apache2_debian_trailing_name_missed-apache.label.yml b/tests/cluecode/data/copyrights/apache2_debian_trailing_name_missed-apache.label.yml
index 6e135547fd..10c75efe9e 100644
--- a/tests/cluecode/data/copyrights/apache2_debian_trailing_name_missed-apache.label.yml
+++ b/tests/cluecode/data/copyrights/apache2_debian_trailing_name_missed-apache.label.yml
@@ -95,3 +95,33 @@ holders_summary:
     count: 1
   - value: the University of Cambridge, England
     count: 1
+allrights:
+  - copyright Steinar H. Gunderson <sgunderson@bigfoot.com> and Knut Auvor Grythe <knut@auvor.no>
+  - Copyright (c) 1996-1997 Cisco Systems, Inc.
+  - Copyright (c) Ian F. Darwin, 1987.
+  - Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
+  - copyright 1992 by Eric Haines, erich@eye.com
+  - Copyright (c) 1995, Board of Trustees of the University of Illinois
+  - Copyright (c) 1994, Jeff Hostetler, Spyglass, Inc.
+  - Copyright (c) 1993, 1994 by Carnegie Mellon University
+  - Copyright (c) 1991 Bell Communications Research, Inc.
+  - (c) Copyright 1993,1994 by Carnegie Mellon University All Rights Reserved.
+  - Copyright (c) 1991 Bell Communications Research, Inc.
+  - Copyright RSA Data Security, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - Copyright RSA Data Security, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - copyright RSA Data Security, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - copyright RSA Data Security, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - Copyright (c) 2000-2002 The Apache Software Foundation. All rights reserved.
+  - copyright RSA Data Security, Inc.
+  - Copyright (c) 1990-2, RSA Data Security, Inc.
+  - Copyright 1991 by the Massachusetts Institute of Technology
+  - Copyright 1991 by the Massachusetts Institute of Technology
+  - Copyright (c) 1997-2001 University of Cambridge
+  - copyright by the University of Cambridge, England.
+  - Copyright (c) Zeus Technology Limited 1996.
+  - Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper
+  - copyright of Pete Harlow
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/apache_notice-NOTICE.yml b/tests/cluecode/data/copyrights/apache_notice-NOTICE.yml
index a8610b1c8e..ec34553f4d 100644
--- a/tests/cluecode/data/copyrights/apache_notice-NOTICE.yml
+++ b/tests/cluecode/data/copyrights/apache_notice-NOTICE.yml
@@ -17,3 +17,8 @@ holders_summary:
     count: 3
   - value: World Wide Web Consortium
     count: 1
+allrights:
+  - Copyright 1999-2006 The Apache Software Foundation
+  - Copyright 1999-2006 The Apache Software Foundation
+  - Copyright 2001-2003,2006 The Apache Software Foundation.
+  - copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/apachev1_0-Apachev.0.yml b/tests/cluecode/data/copyrights/apachev1_0-Apachev.0.yml
index 1d0447dcb2..00a573f3cc 100644
--- a/tests/cluecode/data/copyrights/apachev1_0-Apachev.0.yml
+++ b/tests/cluecode/data/copyrights/apachev1_0-Apachev.0.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Apache Software Foundation
     count: 1
+allrights:
+  - Copyright (c) 1995-1999 The Apache Group. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/apachev1_1-Apachev.1.yml b/tests/cluecode/data/copyrights/apachev1_1-Apachev.1.yml
index 6c5502a949..4e47946537 100644
--- a/tests/cluecode/data/copyrights/apachev1_1-Apachev.1.yml
+++ b/tests/cluecode/data/copyrights/apachev1_1-Apachev.1.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Apache Software Foundation
     count: 1
+allrights:
+  - Copyright (c) 2000 The Apache Software Foundation. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/apple_public_source_license_v1_0-Apple_Public_Source_License_v.0.yml b/tests/cluecode/data/copyrights/apple_public_source_license_v1_0-Apple_Public_Source_License_v.0.yml
index 3d277aa460..422f7fb898 100644
--- a/tests/cluecode/data/copyrights/apple_public_source_license_v1_0-Apple_Public_Source_License_v.0.yml
+++ b/tests/cluecode/data/copyrights/apple_public_source_license_v1_0-Apple_Public_Source_License_v.0.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Apple Computer, Inc.
     count: 1
+allrights:
+  - Portions Copyright (c) 1999 Apple Computer, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/apple_public_source_license_v1_1-Apple_Public_Source_License_v.1.yml b/tests/cluecode/data/copyrights/apple_public_source_license_v1_1-Apple_Public_Source_License_v.1.yml
index a0fb088809..a10889d58b 100644
--- a/tests/cluecode/data/copyrights/apple_public_source_license_v1_1-Apple_Public_Source_License_v.1.yml
+++ b/tests/cluecode/data/copyrights/apple_public_source_license_v1_1-Apple_Public_Source_License_v.1.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Apple Computer, Inc.
     count: 1
+allrights:
+  - Portions Copyright (c) 1999-2000 Apple Computer, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/apple_public_source_license_v1_2-Apple_Public_Source_License_v.2.yml b/tests/cluecode/data/copyrights/apple_public_source_license_v1_2-Apple_Public_Source_License_v.2.yml
index a8d9d36a0d..c1d408597e 100644
--- a/tests/cluecode/data/copyrights/apple_public_source_license_v1_2-Apple_Public_Source_License_v.2.yml
+++ b/tests/cluecode/data/copyrights/apple_public_source_license_v1_2-Apple_Public_Source_License_v.2.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Apple Computer, Inc.
     count: 1
+allrights:
+  - Portions Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/apslv2_0-APSLv.0.yml b/tests/cluecode/data/copyrights/apslv2_0-APSLv.0.yml
index c6c4104050..9e6fa64d50 100644
--- a/tests/cluecode/data/copyrights/apslv2_0-APSLv.0.yml
+++ b/tests/cluecode/data/copyrights/apslv2_0-APSLv.0.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Apple Inc.
     count: 1
+allrights:
+  - Portions Copyright (c) 1999-2007 Apple Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/artistic_v2_0beta4-Artistic_v_beta.0beta4.yml b/tests/cluecode/data/copyrights/artistic_v2_0beta4-Artistic_v_beta.0beta4.yml
index 653a9c6429..4afc96d910 100644
--- a/tests/cluecode/data/copyrights/artistic_v2_0beta4-Artistic_v_beta.0beta4.yml
+++ b/tests/cluecode/data/copyrights/artistic_v2_0beta4-Artistic_v_beta.0beta4.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Larry Wall
     count: 1
+allrights:
+  - Copyright (c) 2000, Larry Wall.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/artisticv2_0-Artisticv.0.yml b/tests/cluecode/data/copyrights/artisticv2_0-Artisticv.0.yml
index 3a0054ca58..f6ae70756c 100644
--- a/tests/cluecode/data/copyrights/artisticv2_0-Artisticv.0.yml
+++ b/tests/cluecode/data/copyrights/artisticv2_0-Artisticv.0.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Perl Foundation
     count: 1
+allrights:
+  - Copyright (c) 2000-2006, The Perl Foundation.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/atheros_spanning_lines-py.py.yml b/tests/cluecode/data/copyrights/atheros_spanning_lines-py.py.yml
index d8510418ca..b0b05745cc 100644
--- a/tests/cluecode/data/copyrights/atheros_spanning_lines-py.py.yml
+++ b/tests/cluecode/data/copyrights/atheros_spanning_lines-py.py.yml
@@ -15,3 +15,7 @@ holders_summary:
     count: 2
   - value: Intel Corporation
     count: 1
+allrights:
+  - Copyright (c) 2000 Atheros Communications, Inc., All Rights Reserved
+  - Copyright (c) 2001 Atheros Communications, Inc., All Rights Reserved
+  - Copyright (c) 1994-1997 by Intel Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/audio_c-c.c.yml b/tests/cluecode/data/copyrights/audio_c-c.c.yml
index dae1b52cd9..3d778d8baa 100644
--- a/tests/cluecode/data/copyrights/audio_c-c.c.yml
+++ b/tests/cluecode/data/copyrights/audio_c-c.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: AudioCodes, DSP Group, France Telecom, Universite de Sherbrooke
     count: 1
+allrights:
+  - copyright (c) 1995, AudioCodes, DSP Group, France Telecom, Universite de Sherbrooke. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/author_young_c-c.c.yml b/tests/cluecode/data/copyrights/author_young_c-c.c.yml
index e7d4fec90e..9655fa7613 100644
--- a/tests/cluecode/data/copyrights/author_young_c-c.c.yml
+++ b/tests/cluecode/data/copyrights/author_young_c-c.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1997 Eric Young (eay@mincom.oz.au) All rights reserved.
+  - holder is Tim Hudson (tjh@mincom.oz.au).
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/authors_at_ucl.txt.yml b/tests/cluecode/data/copyrights/authors_at_ucl.txt.yml
index b2aaa9b8dd..5f4749edc9 100644
--- a/tests/cluecode/data/copyrights/authors_at_ucl.txt.yml
+++ b/tests/cluecode/data/copyrights/authors_at_ucl.txt.yml
@@ -8,3 +8,5 @@ holders:
   - University College London
 authors:
   - the Computer Science Department at University College London
+allrights:
+  - Copyright (c) 1998-2000 University College London All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/bigelow_holmes-Bigelow&Holmes.yml b/tests/cluecode/data/copyrights/bigelow_holmes-Bigelow&Holmes.yml
index c70fb34fbf..9a6ea631a2 100644
--- a/tests/cluecode/data/copyrights/bigelow_holmes-Bigelow&Holmes.yml
+++ b/tests/cluecode/data/copyrights/bigelow_holmes-Bigelow&Holmes.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Sun Microsystems
     count: 1
+allrights:
+  - (c) Copyright 1989 Sun Microsystems, Inc.
+  - (c) Copyright Bigelow & Holmes 1986, 1985.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/bitstream-Bi_ream.yml b/tests/cluecode/data/copyrights/bitstream-Bi_ream.yml
index 4d2bfc4072..8acb2dfbf3 100644
--- a/tests/cluecode/data/copyrights/bitstream-Bi_ream.yml
+++ b/tests/cluecode/data/copyrights/bitstream-Bi_ream.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Bitstream, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/brackets.txt.yml b/tests/cluecode/data/copyrights/brackets.txt.yml
index d1e4648b28..41c645f6f5 100644
--- a/tests/cluecode/data/copyrights/brackets.txt.yml
+++ b/tests/cluecode/data/copyrights/brackets.txt.yml
@@ -9,3 +9,5 @@ expected_failures:
   - copyrights
   - holders
 notes: we only get Copyright (c) <2010-2012> as a detection for now.
+allrights:
+  - Copyright (c) 2010-2012 Jessup
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/bv.txt.yml b/tests/cluecode/data/copyrights/bv.txt.yml
index eb0f49c515..23b7955c6c 100644
--- a/tests/cluecode/data/copyrights/bv.txt.yml
+++ b/tests/cluecode/data/copyrights/bv.txt.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: HERE Europe B.V.
     count: 1
+allrights:
+  - Copyright (c) 2016 HERE Europe B.V. All rights Reserved.
+  - (c) HERE 2016
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/c-c.c.yml b/tests/cluecode/data/copyrights/c-c.c.yml
index 3c905997df..3773e542b0 100644
--- a/tests/cluecode/data/copyrights/c-c.c.yml
+++ b/tests/cluecode/data/copyrights/c-c.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: STMicroelectronics
     count: 1
+allrights:
+  - COPYRIGHT (c) STMicroelectronics 2005.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/c_include-h.h.yml b/tests/cluecode/data/copyrights/c_include-h.h.yml
index 07e66a4a28..5bdf2e341f 100644
--- a/tests/cluecode/data/copyrights/c_include-h.h.yml
+++ b/tests/cluecode/data/copyrights/c_include-h.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: ST-Microelectronics
     count: 1
+allrights:
+  - COPYRIGHT (c) ST-Microelectronics 1998.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/ccube_txt.txt.yml b/tests/cluecode/data/copyrights/ccube_txt.txt.yml
index da073deb44..56d8fda7e5 100644
--- a/tests/cluecode/data/copyrights/ccube_txt.txt.yml
+++ b/tests/cluecode/data/copyrights/ccube_txt.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: C-Cube Microsystems
     count: 1
+allrights:
+  - Copyright (c) 2001 C-Cube Microsystems. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/cern-TestMatrix_D_java.java.yml b/tests/cluecode/data/copyrights/cern-TestMatrix_D_java.java.yml
index bae9836c45..6909af39dd 100644
--- a/tests/cluecode/data/copyrights/cern-TestMatrix_D_java.java.yml
+++ b/tests/cluecode/data/copyrights/cern-TestMatrix_D_java.java.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: CERN - European Organization for Nuclear Research
     count: 1
+allrights:
+  - Copyright 1999 CERN - European Organization for Nuclear Research.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/cern_matrix2d_java-TestMatrix_D_java.java.yml b/tests/cluecode/data/copyrights/cern_matrix2d_java-TestMatrix_D_java.java.yml
index 43a4b65e42..cd7a526b78 100644
--- a/tests/cluecode/data/copyrights/cern_matrix2d_java-TestMatrix_D_java.java.yml
+++ b/tests/cluecode/data/copyrights/cern_matrix2d_java-TestMatrix_D_java.java.yml
@@ -15,3 +15,7 @@ holders_summary:
     count: 2
   - value: CERN - European Organization for Nuclear Research
     count: 1
+allrights:
+  - Copyright 1999 CERN - European Organization for Nuclear Research.
+  - Copyright (c) 1998 Company PIERSOL Engineering Inc.
+  - Copyright (c) 1998 Company PIERSOL Engineering Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/cnri-CNRI.yml b/tests/cluecode/data/copyrights/cnri-CNRI.yml
index 4b12e6dc68..0e79e102aa 100644
--- a/tests/cluecode/data/copyrights/cnri-CNRI.yml
+++ b/tests/cluecode/data/copyrights/cnri-CNRI.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Corporation for National Research Initiatives
     count: 1
+allrights:
+  - Copyright (c) 1995-2000 Corporation for National Research Initiatives All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/colin_android-bsdiff_c.c.yml b/tests/cluecode/data/copyrights/colin_android-bsdiff_c.c.yml
index 29aef713b0..3f998ec328 100644
--- a/tests/cluecode/data/copyrights/colin_android-bsdiff_c.c.yml
+++ b/tests/cluecode/data/copyrights/colin_android-bsdiff_c.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Colin Percival
     count: 1
+allrights:
+  - Copyright (c) 2009 The Android Open Source Project
+  - Copyright 2003-2005 Colin Percival All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/company_in_txt-9.txt.yml b/tests/cluecode/data/copyrights/company_in_txt-9.txt.yml
index d8eb72e706..b1e59f2ac2 100644
--- a/tests/cluecode/data/copyrights/company_in_txt-9.txt.yml
+++ b/tests/cluecode/data/copyrights/company_in_txt-9.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Company Name Incorporated
     count: 1
+allrights:
+  - Copyright (c) 2008-2011 Company Name Incorporated All rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/company_name_in_java-9_java.java.yml b/tests/cluecode/data/copyrights/company_name_in_java-9_java.java.yml
index d8eb72e706..b1e59f2ac2 100644
--- a/tests/cluecode/data/copyrights/company_name_in_java-9_java.java.yml
+++ b/tests/cluecode/data/copyrights/company_name_in_java-9_java.java.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Company Name Incorporated
     count: 1
+allrights:
+  - Copyright (c) 2008-2011 Company Name Incorporated All rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/complex_4_line_statement_in_text-9.txt.yml b/tests/cluecode/data/copyrights/complex_4_line_statement_in_text-9.txt.yml
index 238642b4db..54bce11ae0 100644
--- a/tests/cluecode/data/copyrights/complex_4_line_statement_in_text-9.txt.yml
+++ b/tests/cluecode/data/copyrights/complex_4_line_statement_in_text-9.txt.yml
@@ -14,3 +14,6 @@ holders_summary:
     count: 1
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright 2002 Jonas Borgstrom <jonas@codefactory.se> 2002 Daniel Lundin <daniel@codefactory.se> 2002 CodeFactory AB. All rights reserved.
+  - Copyright (c) 1994 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/complex_notice-NOTICE.yml b/tests/cluecode/data/copyrights/complex_notice-NOTICE.yml
index aa18c45436..85760d53a1 100644
--- a/tests/cluecode/data/copyrights/complex_notice-NOTICE.yml
+++ b/tests/cluecode/data/copyrights/complex_notice-NOTICE.yml
@@ -74,3 +74,30 @@ holders_summary:
     count: 1
   - value: The NetBSD Foundation, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2003, Steven G. Kargl All rights reserved.
+  - Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
+  - Copyright (c) 2002, 2003 David Schultz <das@FreeBSD.ORG>
+  - Copyright (c) 2003 David Schultz <das@FreeBSD.ORG>
+  - Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
+  - Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
+  - Copyright (c) 2005 David Schultz <das@FreeBSD.ORG>
+  - Copyright (c) 2002 David Schultz <das@FreeBSD.ORG> All rights reserved.
+  - Copyright (c) 2004 Stefan Farfeleder All rights reserved.
+  - Copyright (c) 2003 Dag-Erling Coidan Smorgrav All rights reserved.
+  - Copyright (c) 1996 The NetBSD Foundation, Inc. All rights reserved.
+  - Copyright (c) 1985, 1993
+  - Copyright (c) 1988, 1993 Copyright (c) 1992, 1993 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 1993,94 Winning Strategies, Inc.
+  - Copyright (c) 1994 Winning Strategies, Inc. All rights reserved.
+  - Copyright (c) 1993 by Sun Microsystems, Inc. All rights reserved.
+  - Copyright (c) 1993 by Sun Microsystems, Inc. All rights reserved.
+  - Copyright (c) 1993 by Sun Microsystems, Inc. All rights reserved.
+  - Copyright (c) 2004 by Sun Microsystems, Inc. All rights reserved.
+  - Copyright (c) 2004 Stefan Farfeleder
+  - Copyright (c) 2004 David Schultz <das@FreeBSD.org>
+  - Copyright (c) 2004, 2005 David Schultz <das@FreeBSD.org>
+  - Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
+  - Copyright (c) 2005 David Schultz <das@FreeBSD.org> All rights reserved.
+  - Copyright (c) 2003, Steven G. Kargl All rights reserved.
+  - Copyright (c) 1991 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/complex_notice_sun_microsystems_on_multiple_lines-NOTICE.yml b/tests/cluecode/data/copyrights/complex_notice_sun_microsystems_on_multiple_lines-NOTICE.yml
index 5cf6918508..09d9109ce1 100644
--- a/tests/cluecode/data/copyrights/complex_notice_sun_microsystems_on_multiple_lines-NOTICE.yml
+++ b/tests/cluecode/data/copyrights/complex_notice_sun_microsystems_on_multiple_lines-NOTICE.yml
@@ -29,3 +29,12 @@ holders_summary:
     count: 1
   - value: The Apache Software Foundation
     count: 1
+allrights:
+  - Copyright 1999-2006 The Apache Software Foundation
+  - copyright (c) 1999-2002, Lotus Development Corporation., http://www.lotus.com.
+  - copyright (c) 2001-2002, Sun Microsystems., http://www.sun.com.
+  - copyright (c) 2003, IBM Corporation., http://www.ibm.com.
+  - copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+  - copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+  - copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+  - copyright (c) 1999, Sun Microsystems., http://www.sun.com.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/composite_copy.txt.yml b/tests/cluecode/data/copyrights/composite_copy.txt.yml
index e4c37b994a..08d5d7c120 100644
--- a/tests/cluecode/data/copyrights/composite_copy.txt.yml
+++ b/tests/cluecode/data/copyrights/composite_copy.txt.yml
@@ -5,3 +5,5 @@ copyrights:
   - copyrighted by Object Computing, Inc., St. Louis Missouri, Copyright (c) 2002
 holders:
   - Object Computing, Inc., St. Louis Missouri
+allrights:
+  - copyrighted by Object Computing, Inc., St. Louis Missouri, Copyright (c) 2002, all rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/condor_extra_For-Condor.yml b/tests/cluecode/data/copyrights/condor_extra_For-Condor.yml
index 0e9aafd83b..f119283bb0 100644
--- a/tests/cluecode/data/copyrights/condor_extra_For-Condor.yml
+++ b/tests/cluecode/data/copyrights/condor_extra_For-Condor.yml
@@ -11,3 +11,5 @@ holders_summary:
   - value: Condor Team, Computer Sciences Department, University of Wisconsin-Madison, Madison,
       WI.
     count: 1
+allrights:
+  - Copyright 1990-2006 Condor Team, Computer Sciences Department, University of Wisconsin-Madison, Madison, WI. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/copyright_without_icon.txt.yml b/tests/cluecode/data/copyrights/copyright_without_icon.txt.yml
index ea1c0a5519..cdbc6ef458 100644
--- a/tests/cluecode/data/copyrights/copyright_without_icon.txt.yml
+++ b/tests/cluecode/data/copyrights/copyright_without_icon.txt.yml
@@ -13,3 +13,5 @@ holders_summary:
 copyrights_summary:
   - value: Copyright Foobar Pvt. Ltd
     count: 1
+allrights:
+  - Copyright Foobar Pvt. Ltd.. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/copytest/and_subsidiaries.txt.yml b/tests/cluecode/data/copyrights/copytest/and_subsidiaries.txt.yml
index c2aace97f6..1ae5bd7520 100644
--- a/tests/cluecode/data/copyrights/copytest/and_subsidiaries.txt.yml
+++ b/tests/cluecode/data/copyrights/copytest/and_subsidiaries.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Robert Bosch GmbH and its subsidiaries
     count: 1
+allrights:
+  - Copyright (c) 2009, 2018 Robert Bosch GmbH and its subsidiaries.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/copytest/hp_co_or_company.txt.yml b/tests/cluecode/data/copyrights/copytest/hp_co_or_company.txt.yml
index 4fd838a43c..131e4e5645 100644
--- a/tests/cluecode/data/copyrights/copytest/hp_co_or_company.txt.yml
+++ b/tests/cluecode/data/copyrights/copytest/hp_co_or_company.txt.yml
@@ -13,3 +13,7 @@ holders:
 holders_summary:
   - value: Hewlett-Packard
     count: 3
+allrights:
+  - Copyright (c) 1993-2007 Hewlett-Packard Company ALL RIGHTS RESERVED.
+  - copyrighted works of Hewlett-Packard Co.
+  - (c) Copyright 1993-2007 Hewlett-Packard Co.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/copytest/two_lines.txt.yml b/tests/cluecode/data/copyrights/copytest/two_lines.txt.yml
index 4ae29eb57a..e2e6783a06 100644
--- a/tests/cluecode/data/copyrights/copytest/two_lines.txt.yml
+++ b/tests/cluecode/data/copyrights/copytest/two_lines.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2005, 2008-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/copytest/with_caps_and_dots.txt.yml b/tests/cluecode/data/copyrights/copytest/with_caps_and_dots.txt.yml
index 536b626cec..f1332d836c 100644
--- a/tests/cluecode/data/copyrights/copytest/with_caps_and_dots.txt.yml
+++ b/tests/cluecode/data/copyrights/copytest/with_caps_and_dots.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: D.T.Shield
     count: 1
+allrights:
+  - Copyright 1999, 2000 - D.T.Shield.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/copytest/with_debian_s_tag.txt.yml b/tests/cluecode/data/copyrights/copytest/with_debian_s_tag.txt.yml
index 00771a3c88..05e4aeccca 100644
--- a/tests/cluecode/data/copyrights/copytest/with_debian_s_tag.txt.yml
+++ b/tests/cluecode/data/copyrights/copytest/with_debian_s_tag.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Trolltech ASA.
     count: 1
+allrights:
+  - Copyright (c) Trolltech ASA. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/copytest/with_lead_copy_sign_and_debian_s_tags.txt.yml b/tests/cluecode/data/copyrights/copytest/with_lead_copy_sign_and_debian_s_tags.txt.yml
index 2356490691..2f65f8b6d6 100644
--- a/tests/cluecode/data/copyrights/copytest/with_lead_copy_sign_and_debian_s_tags.txt.yml
+++ b/tests/cluecode/data/copyrights/copytest/with_lead_copy_sign_and_debian_s_tags.txt.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Trolltech ASA.
     count: 1
+allrights:
+  - Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+  - (c) 1994-2008 Trolltech ASA.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/copytest/with_more_debian_s_tags.txt.yml b/tests/cluecode/data/copyrights/copytest/with_more_debian_s_tags.txt.yml
index c9a1c9a31c..5f7d253997 100644
--- a/tests/cluecode/data/copyrights/copytest/with_more_debian_s_tags.txt.yml
+++ b/tests/cluecode/data/copyrights/copytest/with_more_debian_s_tags.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Nokia Corporation and/or its subsidiary(-ies)
     count: 1
+allrights:
+  - Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/copytest/with_trailing_software.txt.yml b/tests/cluecode/data/copyrights/copytest/with_trailing_software.txt.yml
index b9e7a1024a..6ba8eab276 100644
--- a/tests/cluecode/data/copyrights/copytest/with_trailing_software.txt.yml
+++ b/tests/cluecode/data/copyrights/copytest/with_trailing_software.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Ian F. Darwin
     count: 1
+allrights:
+  - Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/copytest/with_trailing_year.txt.yml b/tests/cluecode/data/copyrights/copytest/with_trailing_year.txt.yml
index 0c3b650b4f..afa7aaef91 100644
--- a/tests/cluecode/data/copyrights/copytest/with_trailing_year.txt.yml
+++ b/tests/cluecode/data/copyrights/copytest/with_trailing_year.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Internet Society
     count: 1
+allrights:
+  - Copyright (c) The Internet Society (2004).
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/coreutils_debian-coreutils.copyright.yml b/tests/cluecode/data/copyrights/coreutils_debian-coreutils.copyright.yml
index e68885cd19..b5223c20db 100644
--- a/tests/cluecode/data/copyrights/coreutils_debian-coreutils.copyright.yml
+++ b/tests/cluecode/data/copyrights/coreutils_debian-coreutils.copyright.yml
@@ -55,3 +55,23 @@ holders_summary:
     count: 1
   - value: Internet Software Consortium
     count: 1
+allrights:
+  - Copyright (c) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+  - Copyright (c) 1990, 1993, 1994 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+  - Copyright (c) 1989, 1993 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 1999-2006 Free Software Foundation, Inc.
+  - Copyright (c) 1997, 1998, 1999 Colin Plumb.
+  - Copyright (c) 2005, 2006 Free Software Foundation, Inc.
+  - Copyright (c) 1996-1999 by Internet Software Consortium.
+  - Copyright (c) 2004, 2006, 2007 Free Software Foundation, Inc.
+  - Copyright (c) 1997-2007 Free Software Foundation, Inc.
+  - Copyright (c) 1984 David M. Ihnat
+  - Copyright (c) 1996-2007 Free Software Foundation, Inc.
+  - Copyright (c) 1994, 1995, 1997, 1998, 1999, 2000 H. Peter Anvin
+  - Copyright (c) 1997-2005 Free Software Foundation, Inc.
+  - Copyright (c) 1984 David M. Ihnat
+  - Copyright (c) 1999-2007 Free Software Foundation, Inc.
+  - Copyright (c) 1997, 1998, 1999 Colin Plumb.
+  - Copyright 1994-1996, 2000-2008 Free Software Foundation, Inc.
+  - Copyright (c) 1984-2008 Free Software Foundation, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/dag_c-s_fabsl_c.c.yml b/tests/cluecode/data/copyrights/dag_c-s_fabsl_c.c.yml
index 94bede6cbe..b7db6412ea 100644
--- a/tests/cluecode/data/copyrights/dag_c-s_fabsl_c.c.yml
+++ b/tests/cluecode/data/copyrights/dag_c-s_fabsl_c.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Dag-Erling Coidan Smorgrav
     count: 1
+allrights:
+  - Copyright (c) 2003 Dag-Erling Coidan Smorgrav All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/dag_elring_notice-NOTICE.yml b/tests/cluecode/data/copyrights/dag_elring_notice-NOTICE.yml
index 43afb7d33b..82591e9ed0 100644
--- a/tests/cluecode/data/copyrights/dag_elring_notice-NOTICE.yml
+++ b/tests/cluecode/data/copyrights/dag_elring_notice-NOTICE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Dag-Erling Codan Smrgrav
     count: 1
+allrights:
+  - Copyright (c) 2003 Dag-Erling Codan Smrgrav All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/date_range_dahua_in_c-c.c.yml b/tests/cluecode/data/copyrights/date_range_dahua_in_c-c.c.yml
index ba237805f2..ee5bc0d15d 100644
--- a/tests/cluecode/data/copyrights/date_range_dahua_in_c-c.c.yml
+++ b/tests/cluecode/data/copyrights/date_range_dahua_in_c-c.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Dahua Digital
     count: 1
+allrights:
+  - (c) Copyright 2006 to 2007 Dahua Digital.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/debian_lib_1-libmono_cairo_cil.label.yml b/tests/cluecode/data/copyrights/debian_lib_1-libmono_cairo_cil.label.yml
index 61a541490c..44b3b15fe7 100644
--- a/tests/cluecode/data/copyrights/debian_lib_1-libmono_cairo_cil.label.yml
+++ b/tests/cluecode/data/copyrights/debian_lib_1-libmono_cairo_cil.label.yml
@@ -65,3 +65,19 @@ notes: |
   These are missing the trailing: and Rabbit Technologies Ltd.
   Copyright (c) 2007, 2008 LShift Ltd. , Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
   Copyright (c) 2007 LShift Ltd. , Cohesive Financial Technologies LLC.', and Rabbit Technologies Ltd.
+allrights:
+  - Copyright 2004 The Apache Software Foundation
+  - Copyright (c) 2001-2005 Novell
+  - Copyright (c) Microsoft Corporation. All rights reserved.
+  - Copyright (c) 2007 James Newton-King
+  - Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov, Charlie Poole
+  - Copyright (c) 2000-2004 Philip A. Craig
+  - Portions Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov, Charlie Poole
+  - Copyright (c) 2000-2004 Philip A. Craig
+  - Copyright (c) 2007, 2008 LShift Ltd.
+  - Copyright (c) 2007, 2008 Cohesive Financial Technologies LLC.
+  - Copyright (c) 2007, 2008 Rabbit Technologies Ltd.
+  - Copyright (c) 2007, 2008 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
+  - Copyright (c) 2007, 2008 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
+  - Copyright (c) 2007 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
+  - Copyright (c) ???? Simon Mourier <simonm@microsoft.com>
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/debian_lib_2-libmono_cairo_cil.copyright.yml b/tests/cluecode/data/copyrights/debian_lib_2-libmono_cairo_cil.copyright.yml
index ecb3b0639d..297cbaa242 100644
--- a/tests/cluecode/data/copyrights/debian_lib_2-libmono_cairo_cil.copyright.yml
+++ b/tests/cluecode/data/copyrights/debian_lib_2-libmono_cairo_cil.copyright.yml
@@ -61,3 +61,19 @@ holders_summary:
     count: 1
   - value: The Apache Software Foundation
     count: 1
+allrights:
+  - Copyright 2004 The Apache Software Foundation
+  - Copyright (c) 2001-2005 Novell
+  - Copyright (c) Microsoft Corporation. All rights reserved.
+  - Copyright (c) 2007 James Newton-King
+  - Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov, Charlie Poole
+  - Copyright (c) 2000-2004 Philip A. Craig
+  - Portions Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov, Charlie Poole
+  - Copyright (c) 2000-2004 Philip A. Craig
+  - Copyright (c) 2007, 2008 LShift Ltd.
+  - Copyright (c) 2007, 2008 Cohesive Financial Technologies LLC.
+  - Copyright (c) 2007, 2008 Rabbit Technologies Ltd.
+  - Copyright (c) 2007, 2008 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
+  - Copyright (c) 2007, 2008 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
+  - Copyright (c) 2007 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
+  - Copyright (c) ???? Simon Mourier <simonm@microsoft.com>
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/debian_lib_3-libmono_security_cil.copyright.yml b/tests/cluecode/data/copyrights/debian_lib_3-libmono_security_cil.copyright.yml
index ecb3b0639d..297cbaa242 100644
--- a/tests/cluecode/data/copyrights/debian_lib_3-libmono_security_cil.copyright.yml
+++ b/tests/cluecode/data/copyrights/debian_lib_3-libmono_security_cil.copyright.yml
@@ -61,3 +61,19 @@ holders_summary:
     count: 1
   - value: The Apache Software Foundation
     count: 1
+allrights:
+  - Copyright 2004 The Apache Software Foundation
+  - Copyright (c) 2001-2005 Novell
+  - Copyright (c) Microsoft Corporation. All rights reserved.
+  - Copyright (c) 2007 James Newton-King
+  - Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov, Charlie Poole
+  - Copyright (c) 2000-2004 Philip A. Craig
+  - Portions Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov, Charlie Poole
+  - Copyright (c) 2000-2004 Philip A. Craig
+  - Copyright (c) 2007, 2008 LShift Ltd.
+  - Copyright (c) 2007, 2008 Cohesive Financial Technologies LLC.
+  - Copyright (c) 2007, 2008 Rabbit Technologies Ltd.
+  - Copyright (c) 2007, 2008 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
+  - Copyright (c) 2007, 2008 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
+  - Copyright (c) 2007 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
+  - Copyright (c) ???? Simon Mourier <simonm@microsoft.com>
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/debian_multi_names_on_one_line-libgdata.copyright.yml b/tests/cluecode/data/copyrights/debian_multi_names_on_one_line-libgdata.copyright.yml
index 785af3905a..223411de3b 100644
--- a/tests/cluecode/data/copyrights/debian_multi_names_on_one_line-libgdata.copyright.yml
+++ b/tests/cluecode/data/copyrights/debian_multi_names_on_one_line-libgdata.copyright.yml
@@ -80,3 +80,23 @@ holders_summary:
     count: 1
   - value: Ximian, Inc., Gergo Erdi
     count: 1
+allrights:
+  - Copyright 1999-2004 Ximian, Inc. 1999-2005 Novell, Inc.
+  - copyright 2000-2003 Ximian, Inc., 2003 Gergo Erdi
+  - copyright 2000 Eskil Heyn Olsen, 2000 Ximian, Inc.
+  - copyright 1998 The Free Software Foundation, 2000 Ximian, Inc.
+  - copyright 1998-2005 The OpenLDAP Foundation.
+  - Copyright 1999-2003 The OpenLDAP Foundation, Redwood City, California, USA. All Rights Reserved.
+  - Copyright 1999-2000 Eric Busboom, The Software Studio (http://www.softwarestudio.org) 2001 Critical Path
+  - (c) Copyright 1996 Apple Computer, Inc., AT&T Corp., International Business Machines Corporation and Siemens Rolm Communications Inc.
+  - Copyright (c) 1997 Theo de Raadt.
+  - copyright 2000 Andrea Campi.
+  - copyright 2002 Andrea Campi
+  - copyright 2003 Andrea Campi
+  - Copyright 2002 Jonas Borgstrom <jonas@codefactory.se> 2002 Daniel Lundin <daniel@codefactory.se> 2002 CodeFactory AB. All rights reserved.
+  - copyright 1996 Apple Computer, Inc., AT&T Corp., International Business Machines Corporation and Siemens Rolm Communications Inc.
+  - copyright 1986-2000 Hiram Clawson. All rights reserved.
+  - copyright 1997 Theo de Raadt.
+  - Copyright (c) 1996-2002 Sleepycat Software. All rights reserved.
+  - Copyright (c) 1990, 1993, 1994, 1995, 1996 Keith Bostic. All rights reserved.
+  - Copyright (c) 1990, 1993, 1994, 1995 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/djvulibre_desktop-djvulibre_desktop.copyright.yml b/tests/cluecode/data/copyrights/djvulibre_desktop-djvulibre_desktop.copyright.yml
index c2c0c12ae4..c8c50a0115 100644
--- a/tests/cluecode/data/copyrights/djvulibre_desktop-djvulibre_desktop.copyright.yml
+++ b/tests/cluecode/data/copyrights/djvulibre_desktop-djvulibre_desktop.copyright.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: LizardTech, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2002 Leon Bottou and Yann Le Cun.
+  - Copyright (c) 2001 AT&T
+  - Copyright (c) 1999-2001 LizardTech, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/doc-DOC.yml b/tests/cluecode/data/copyrights/doc-DOC.yml
index 1701f36e2d..bedf996d90 100644
--- a/tests/cluecode/data/copyrights/doc-DOC.yml
+++ b/tests/cluecode/data/copyrights/doc-DOC.yml
@@ -12,3 +12,5 @@ holders_summary:
   - value: Douglas C. Schmidt and his research group at Washington University, University of
       California, Irvine, and Vanderbilt University
     count: 1
+allrights:
+  - copyrighted by Douglas C. Schmidt and his research group at Washington University, University of California, Irvine, and Vanderbilt University, Copyright (c) 1993-2008, all rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/docbook_xsl_doc_html-docbook_xsl_doc_html.copyright.yml b/tests/cluecode/data/copyrights/docbook_xsl_doc_html-docbook_xsl_doc_html.copyright.yml
index 67e0f95045..4842f5bc8e 100644
--- a/tests/cluecode/data/copyrights/docbook_xsl_doc_html-docbook_xsl_doc_html.copyright.yml
+++ b/tests/cluecode/data/copyrights/docbook_xsl_doc_html-docbook_xsl_doc_html.copyright.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: The DocBook Project
     count: 1
+allrights:
+  - Copyright (c) 1999-2007 Norman Walsh.
+  - Copyright (c) 2003 Jiri Kosek.
+  - Copyright (c) 2004-2007 Steve Ball.
+  - Copyright (c) 2005-2008 The DocBook Project.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/does_not_truncate_last_name.txt.yml b/tests/cluecode/data/copyrights/does_not_truncate_last_name.txt.yml
index 4cbd67f859..ecd0514655 100644
--- a/tests/cluecode/data/copyrights/does_not_truncate_last_name.txt.yml
+++ b/tests/cluecode/data/copyrights/does_not_truncate_last_name.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Kenneth MacKay
     count: 1
+allrights:
+  - Copyright 2014, Kenneth MacKay.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/drand48_c-drand_c.c.yml b/tests/cluecode/data/copyrights/drand48_c-drand_c.c.yml
index 909e909079..05b01c5062 100644
--- a/tests/cluecode/data/copyrights/drand48_c-drand_c.c.yml
+++ b/tests/cluecode/data/copyrights/drand48_c-drand_c.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Martin Birgmeier
     count: 1
+allrights:
+  - Copyright (c) 1993 Martin Birgmeier All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/dual_mpl_gpl-Dual_MPL_GPL.yml b/tests/cluecode/data/copyrights/dual_mpl_gpl-Dual_MPL_GPL.yml
index 50d775dbc7..fea69ba16b 100644
--- a/tests/cluecode/data/copyrights/dual_mpl_gpl-Dual_MPL_GPL.yml
+++ b/tests/cluecode/data/copyrights/dual_mpl_gpl-Dual_MPL_GPL.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: the Initial Developer
     count: 1
+allrights:
+  - Portions created by the Initial Developer are Copyright (c) 2002 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/ed-ed.copyright.yml b/tests/cluecode/data/copyrights/ed-ed.copyright.yml
index 9ad3fd072b..4a1f2cdc12 100644
--- a/tests/cluecode/data/copyrights/ed-ed.copyright.yml
+++ b/tests/cluecode/data/copyrights/ed-ed.copyright.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: James Troup
     count: 1
+allrights:
+  - Copyright (c) 1993, 1994 Andrew Moore, Talke Studio.
+  - Copyright (c) 2006, 2007 Antonio Diaz Diaz.
+  - Copyright (c) 1997-2007 James Troup.
+  - Copyright (c) 1993, 2006, 2007 Free Software Foundation, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/entessa-Entessa.yml b/tests/cluecode/data/copyrights/entessa-Entessa.yml
index d722f909cf..3836484763 100644
--- a/tests/cluecode/data/copyrights/entessa-Entessa.yml
+++ b/tests/cluecode/data/copyrights/entessa-Entessa.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Entessa, LLC.
     count: 1
+allrights:
+  - Copyright (c) 2003 Entessa, LLC. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/epiphany_browser_data-epiphany_browser_data.label.yml b/tests/cluecode/data/copyrights/epiphany_browser_data-epiphany_browser_data.label.yml
index 679322b4ce..a12773abb2 100644
--- a/tests/cluecode/data/copyrights/epiphany_browser_data-epiphany_browser_data.label.yml
+++ b/tests/cluecode/data/copyrights/epiphany_browser_data-epiphany_browser_data.label.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: the Initial Developer
     count: 1
+allrights:
+  - Portions created by the Initial Developer are Copyright (c) 2004 the Initial Developer. All Rights Reserved.
+  - (c) 2003-2007, the Debian GNOME team <pkg-gnome-maintainers@lists.alioth.debian.org>
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/eplv1_0b-EPLv_b.0b.yml b/tests/cluecode/data/copyrights/eplv1_0b-EPLv_b.0b.yml
index 94304adb22..e51920b640 100644
--- a/tests/cluecode/data/copyrights/eplv1_0b-EPLv_b.0b.yml
+++ b/tests/cluecode/data/copyrights/eplv1_0b-EPLv_b.0b.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: IBM Corporation and others
     count: 1
+allrights:
+  - Copyright (c) 2003, 2005 IBM Corporation and others. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/eric_young_c-c.c.yml b/tests/cluecode/data/copyrights/eric_young_c-c.c.yml
index e7d4fec90e..9655fa7613 100644
--- a/tests/cluecode/data/copyrights/eric_young_c-c.c.yml
+++ b/tests/cluecode/data/copyrights/eric_young_c-c.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1997 Eric Young (eay@mincom.oz.au) All rights reserved.
+  - holder is Tim Hudson (tjh@mincom.oz.au).
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/errno_atheros-c.c.yml b/tests/cluecode/data/copyrights/errno_atheros-c.c.yml
index aff285c3c1..38c56bf146 100644
--- a/tests/cluecode/data/copyrights/errno_atheros-c.c.yml
+++ b/tests/cluecode/data/copyrights/errno_atheros-c.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Sam Leffler, Errno Consulting, Atheros Communications, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros Communications, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/errno_atheros_ah_h-ah_h.h.yml b/tests/cluecode/data/copyrights/errno_atheros_ah_h-ah_h.h.yml
index aff285c3c1..38c56bf146 100644
--- a/tests/cluecode/data/copyrights/errno_atheros_ah_h-ah_h.h.yml
+++ b/tests/cluecode/data/copyrights/errno_atheros_ah_h-ah_h.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Sam Leffler, Errno Consulting, Atheros Communications, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros Communications, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/errno_c-c.c.yml b/tests/cluecode/data/copyrights/errno_c-c.c.yml
index aff285c3c1..38c56bf146 100644
--- a/tests/cluecode/data/copyrights/errno_c-c.c.yml
+++ b/tests/cluecode/data/copyrights/errno_c-c.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Sam Leffler, Errno Consulting, Atheros Communications, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros Communications, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/error-prone.txt.yml b/tests/cluecode/data/copyrights/error-prone.txt.yml
index 47b523b1e0..c14aa1811e 100644
--- a/tests/cluecode/data/copyrights/error-prone.txt.yml
+++ b/tests/cluecode/data/copyrights/error-prone.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright 2015 The Error Prone Authors
 holders:
   - The Error Prone Authors
+allrights:
+  - Copyright 2015 The Error Prone Authors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/et_al.txt.yml b/tests/cluecode/data/copyrights/et_al.txt.yml
index 7c6ea01eb7..d124003a5a 100644
--- a/tests/cluecode/data/copyrights/et_al.txt.yml
+++ b/tests/cluecode/data/copyrights/et_al.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Contributors et.al
     count: 1
+allrights:
+  - Copyright (c) 2017 Contributors et.al.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/eudatagrid-EUDatagrid.yml b/tests/cluecode/data/copyrights/eudatagrid-EUDatagrid.yml
index 87f0c9bd6a..a7c9115e9a 100644
--- a/tests/cluecode/data/copyrights/eudatagrid-EUDatagrid.yml
+++ b/tests/cluecode/data/copyrights/eudatagrid-EUDatagrid.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: EU DataGrid
     count: 1
+allrights:
+  - Copyright (c) 2001 EU DataGrid. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/freebsd-FreeBSD.yml b/tests/cluecode/data/copyrights/freebsd-FreeBSD.yml
index b53955b45d..b6a173e531 100644
--- a/tests/cluecode/data/copyrights/freebsd-FreeBSD.yml
+++ b/tests/cluecode/data/copyrights/freebsd-FreeBSD.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The FreeBSD Project
     count: 1
+allrights:
+  - Copyright 1994-2006 The FreeBSD Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/freetype-FreeType.yml b/tests/cluecode/data/copyrights/freetype-FreeType.yml
index 44b836e35d..45f382aee8 100644
--- a/tests/cluecode/data/copyrights/freetype-FreeType.yml
+++ b/tests/cluecode/data/copyrights/freetype-FreeType.yml
@@ -15,3 +15,7 @@ holders_summary:
     count: 2
   - value: The FreeType Project
     count: 1
+allrights:
+  - Copyright 1996-2002, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg
+  - copyright (c) The FreeType Project (www.freetype.org). All rights reserved.
+  - copyright (c) 1996-2000 by David Turner, Robert Wilhelm, and Werner Lemberg. All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/gailly-c.c.yml b/tests/cluecode/data/copyrights/gailly-c.c.yml
index 26617e14bb..8723baa769 100644
--- a/tests/cluecode/data/copyrights/gailly-c.c.yml
+++ b/tests/cluecode/data/copyrights/gailly-c.c.yml
@@ -13,3 +13,7 @@ holders:
 holders_summary:
   - value: Jean-loup Gailly
     count: 3
+allrights:
+  - Copyright (c) 1992-1993 Jean-loup Gailly.
+  - Copyright (c) 1992-1993 Jean-loup Gailly
+  - Copyright (c) 1992-1993 Jean-loup Gailly
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/glide-Glide.yml b/tests/cluecode/data/copyrights/glide-Glide.yml
index 3e499f9a14..c5bf9a274a 100644
--- a/tests/cluecode/data/copyrights/glide-Glide.yml
+++ b/tests/cluecode/data/copyrights/glide-Glide.yml
@@ -13,3 +13,7 @@ holders:
 holders_summary:
   - value: 3dfx Interactive, Inc.
     count: 3
+allrights:
+  - copyright notice (3dfx Interactive, Inc. 1999)
+  - COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
+  - COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/grapelli_content.css.yml b/tests/cluecode/data/copyrights/grapelli_content.css.yml
index fe8ac2ee11..0d13a9f9ab 100644
--- a/tests/cluecode/data/copyrights/grapelli_content.css.yml
+++ b/tests/cluecode/data/copyrights/grapelli_content.css.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: vonautomatisch werkstaetten
     count: 1
+allrights:
+  - Copyright (c) 2009, vonautomatisch werkstaetten. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/gsoap-gSOAP.yml b/tests/cluecode/data/copyrights/gsoap-gSOAP.yml
index fa934be422..061462199b 100644
--- a/tests/cluecode/data/copyrights/gsoap-gSOAP.yml
+++ b/tests/cluecode/data/copyrights/gsoap-gSOAP.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Robert A. van Engelen, Genivia inc.
     count: 2
+allrights:
+  - Copyright (c) 2001-2004 Robert A. van Engelen, Genivia inc. All Rights Reserved.
+  - Copyright (c) 2001-2004 Robert A. van Engelen, Genivia inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/h-h.h.yml b/tests/cluecode/data/copyrights/h-h.h.yml
index 07e66a4a28..5bdf2e341f 100644
--- a/tests/cluecode/data/copyrights/h-h.h.yml
+++ b/tests/cluecode/data/copyrights/h-h.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: ST-Microelectronics
     count: 1
+allrights:
+  - COPYRIGHT (c) ST-Microelectronics 1998.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/hans_jurgen_htm-9_html.html.yml b/tests/cluecode/data/copyrights/hans_jurgen_htm-9_html.html.yml
index 50e7c9e885..db0e0e9605 100644
--- a/tests/cluecode/data/copyrights/hans_jurgen_htm-9_html.html.yml
+++ b/tests/cluecode/data/copyrights/hans_jurgen_htm-9_html.html.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Hans-Jurgen Koch
     count: 1
+allrights:
+  - Copyright (c) 2006 by Hans-Jurgen Koch.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/hansen_cs-cs.cs.yml b/tests/cluecode/data/copyrights/hansen_cs-cs.cs.yml
index e86b5160c1..d97e7af126 100644
--- a/tests/cluecode/data/copyrights/hansen_cs-cs.cs.yml
+++ b/tests/cluecode/data/copyrights/hansen_cs-cs.cs.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Thomas Hansen
     count: 1
+allrights:
+  - Copyright 2009 - Thomas Hansen thomas@ra-ajax.org.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/heunrich_c-c.c.yml b/tests/cluecode/data/copyrights/heunrich_c-c.c.yml
index 964b477d86..58d2bd84dc 100644
--- a/tests/cluecode/data/copyrights/heunrich_c-c.c.yml
+++ b/tests/cluecode/data/copyrights/heunrich_c-c.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: HEUNRICH HERTZ INSTITUTE
     count: 1
+allrights:
+  - Copyright (c) 2000 HEUNRICH HERTZ INSTITUTE All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/hewlett_packard-Hewlett_Packard.yml b/tests/cluecode/data/copyrights/hewlett_packard-Hewlett_Packard.yml
index 5d4e8b16cc..44778f8d56 100644
--- a/tests/cluecode/data/copyrights/hewlett_packard-Hewlett_Packard.yml
+++ b/tests/cluecode/data/copyrights/hewlett_packard-Hewlett_Packard.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Hewlett-Packard
     count: 1
+allrights:
+  - (c) HEWLETT-PACKARD COMPANY, 2004.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/holders.txt.yml b/tests/cluecode/data/copyrights/holders.txt.yml
index e64f5e056b..8311625ee2 100644
--- a/tests/cluecode/data/copyrights/holders.txt.yml
+++ b/tests/cluecode/data/copyrights/holders.txt.yml
@@ -7,3 +7,6 @@ copyrights:
 holders:
   - Tim Hudson
   - Kevin Vandersloot Erik Johnsson
+allrights:
+  - holder is Tim Hudson (tjh@mincom.oz.au).
+  - Copyright Holders Kevin Vandersloot <kfv101@psu.edu> Erik Johnsson <zaphod@linux.nu>
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/holtmann-hciattach_qualcomm_c.c.yml b/tests/cluecode/data/copyrights/holtmann-hciattach_qualcomm_c.c.yml
index 7500697a0d..caa8ee14d0 100644
--- a/tests/cluecode/data/copyrights/holtmann-hciattach_qualcomm_c.c.yml
+++ b/tests/cluecode/data/copyrights/holtmann-hciattach_qualcomm_c.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Marcel Holtmann
     count: 1
+allrights:
+  - Copyright (c) 2005-2010 Marcel Holtmann <marcel@holtmann.org>
+  - Copyright (c) 2010, Code Aurora Forum. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/hpijs_ppds-hpijs_ppds.label.yml b/tests/cluecode/data/copyrights/hpijs_ppds-hpijs_ppds.label.yml
index 7bab37afb2..ab6dceaff5 100644
--- a/tests/cluecode/data/copyrights/hpijs_ppds-hpijs_ppds.label.yml
+++ b/tests/cluecode/data/copyrights/hpijs_ppds-hpijs_ppds.label.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: Torsten Landschoff
     count: 1
+allrights:
+  - Copyright (c) 2003-2004 by Torsten Landschoff <torsten@debian.org>
+  - Copyright (c) 2004-2006 by Henrique de Moraes Holschuh <hmh@debian.org>
+  - Copyright (c) 2001-2006 Hewlett-Packard Company
+  - Copyright (c) 2001-2006 Hewlett-Packard Development Company, L.P. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/ibmpl_v1_0-IBMPL_v.0.yml b/tests/cluecode/data/copyrights/ibmpl_v1_0-IBMPL_v.0.yml
index 0edf4ae02e..3e557cdd99 100644
--- a/tests/cluecode/data/copyrights/ibmpl_v1_0-IBMPL_v.0.yml
+++ b/tests/cluecode/data/copyrights/ibmpl_v1_0-IBMPL_v.0.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: International Business Machines Corporation and others
     count: 1
+allrights:
+  - Copyright (c) 1996, 1999 International Business Machines Corporation and others. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/ietf-IETF.yml b/tests/cluecode/data/copyrights/ietf-IETF.yml
index 361332ee37..956f3b8ae1 100644
--- a/tests/cluecode/data/copyrights/ietf-IETF.yml
+++ b/tests/cluecode/data/copyrights/ietf-IETF.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Internet Society
     count: 1
+allrights:
+  - Copyright (c) The Internet Society (2003). All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/ijg-IJG.yml b/tests/cluecode/data/copyrights/ijg-IJG.yml
index d2d234661a..32885858d8 100644
--- a/tests/cluecode/data/copyrights/ijg-IJG.yml
+++ b/tests/cluecode/data/copyrights/ijg-IJG.yml
@@ -25,3 +25,9 @@ holders_summary:
     count: 1
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - copyright (c) 1991-1998, Thomas G. Lane. All Rights Reserved
+  - copyright holder, Aladdin Enterprises of Menlo Park
+  - copyright by the Free Software Foundation
+  - copyright by M.I.T.
+  - Copyright property of CompuServe Incorporated.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/illinois_html-9_html.html.yml b/tests/cluecode/data/copyrights/illinois_html-9_html.html.yml
index 82043ced6e..5b061b9ae7 100644
--- a/tests/cluecode/data/copyrights/illinois_html-9_html.html.yml
+++ b/tests/cluecode/data/copyrights/illinois_html-9_html.html.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Board of Trustees of the University of Illinois
     count: 1
+allrights:
+  - Copyright 1999,2000,2001,2002,2003,2004 The Board of Trustees of the University of Illinois All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/imatix-iMatix.yml b/tests/cluecode/data/copyrights/imatix-iMatix.yml
index 74e15d079a..5c5706bf5a 100644
--- a/tests/cluecode/data/copyrights/imatix-iMatix.yml
+++ b/tests/cluecode/data/copyrights/imatix-iMatix.yml
@@ -17,3 +17,9 @@ holders:
 holders_summary:
   - value: iMatix Corporation
     count: 5
+allrights:
+  - Copyright 1991-2000 iMatix Corporation.
+  - Copyright 1991-2000 iMatix Corporation
+  - Copyright 1991-2000 iMatix Corporation http://www.imatix.com
+  - Parts copyright (c) 1991-2000 iMatix Corporation.
+  - Copyright 1996-2000 iMatix Corporation
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/in_docstring.py.yml b/tests/cluecode/data/copyrights/in_docstring.py.yml
index c4b8c8350c..a1cdcab104 100644
--- a/tests/cluecode/data/copyrights/in_docstring.py.yml
+++ b/tests/cluecode/data/copyrights/in_docstring.py.yml
@@ -6,3 +6,5 @@ copyrights:
   - (c) 1989-2000 Baz Corporation
 holders:
   - Baz Corporation
+allrights:
+  - (c) 1989-2000 Baz Corporation. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/index.html.yml b/tests/cluecode/data/copyrights/index.html.yml
index fa73b5d62f..19bc871d59 100644
--- a/tests/cluecode/data/copyrights/index.html.yml
+++ b/tests/cluecode/data/copyrights/index.html.yml
@@ -47,3 +47,26 @@ holders:
   - Epic Games, Inc.
   - Christian Rau
   - Yann Collet
+allrights:
+  - Copyright (c) 2002-2009 Charlie Poole
+  - Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov
+  - Copyright (c) 2000-2002 Philip A. Craig
+  - Copyright (c) 2003-2008, Terence Parr. All rights reserved.
+  - Copyright (c) 1994-2011 Lua.org, PUC-Rio
+  - Copyright (c) 2000,2001,2002,2003,2004,2006,2007 Keith Packard
+  - Copyright (c) 2005 Patrick Lam
+  - Copyright (c) 2009 Roozbeh Pournader
+  - Copyright (c) 2008, 2009 Red Hat, Inc.
+  - Copyright (c) 2008 Danilo Segan
+  - Copyright (c) Microsoft Corporation
+  - Copyright (c) 2013 Digia Plc and/or its subsidiary(-ies) and other contributors.
+  - Copyright (c) 1991, 1999 Free Software Foundation, Inc.
+  - copyright (c) 2012 The FreeType Project (www.freetype.org). All rights reserved.
+  - copyright (c) Imagination Technologies Limited. All rights reserved.
+  - Copyright (c) 2008 Google Inc.
+  - copyright (c) Imagination Technologies Limited. All rights reserved.
+  - Copyright (c) 2003-2004 Silicon Graphics, Inc.
+  - Copyright (c) Microsoft Corporation. All Rights Reserved.
+  - copyright (c) Epic Games, Inc. All rights reserved.
+  - Copyright (c) 2012-2013 Christian Rau
+  - Copyright (c) 2011-2014, Yann Collet.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/index.txt.yml b/tests/cluecode/data/copyrights/index.txt.yml
index fa73b5d62f..19bc871d59 100644
--- a/tests/cluecode/data/copyrights/index.txt.yml
+++ b/tests/cluecode/data/copyrights/index.txt.yml
@@ -47,3 +47,26 @@ holders:
   - Epic Games, Inc.
   - Christian Rau
   - Yann Collet
+allrights:
+  - Copyright (c) 2002-2009 Charlie Poole
+  - Copyright (c) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov
+  - Copyright (c) 2000-2002 Philip A. Craig
+  - Copyright (c) 2003-2008, Terence Parr. All rights reserved.
+  - Copyright (c) 1994-2011 Lua.org, PUC-Rio
+  - Copyright (c) 2000,2001,2002,2003,2004,2006,2007 Keith Packard
+  - Copyright (c) 2005 Patrick Lam
+  - Copyright (c) 2009 Roozbeh Pournader
+  - Copyright (c) 2008, 2009 Red Hat, Inc.
+  - Copyright (c) 2008 Danilo Segan
+  - Copyright (c) Microsoft Corporation
+  - Copyright (c) 2013 Digia Plc and/or its subsidiary(-ies) and other contributors.
+  - Copyright (c) 1991, 1999 Free Software Foundation, Inc.
+  - copyright (c) 2012 The FreeType Project (www.freetype.org). All rights reserved.
+  - copyright (c) Imagination Technologies Limited. All rights reserved.
+  - Copyright (c) 2008 Google Inc.
+  - copyright (c) Imagination Technologies Limited. All rights reserved.
+  - Copyright (c) 2003-2004 Silicon Graphics, Inc.
+  - Copyright (c) Microsoft Corporation. All Rights Reserved.
+  - copyright (c) Epic Games, Inc. All rights reserved.
+  - Copyright (c) 2012-2013 Christian Rau
+  - Copyright (c) 2011-2014, Yann Collet.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/intel-Intel.yml b/tests/cluecode/data/copyrights/intel-Intel.yml
index 40d684b06f..7109750418 100644
--- a/tests/cluecode/data/copyrights/intel-Intel.yml
+++ b/tests/cluecode/data/copyrights/intel-Intel.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Intel Corporation
     count: 1
+allrights:
+  - Copyright (c) 2006, Intel Corporation. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/isc-c.c.yml b/tests/cluecode/data/copyrights/isc-c.c.yml
index ea1cffdc65..51a65b6f3d 100644
--- a/tests/cluecode/data/copyrights/isc-c.c.yml
+++ b/tests/cluecode/data/copyrights/isc-c.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Internet Software Consortium
     count: 1
+allrights:
+  - Copyright (c) 1998-2000 The Internet Software Consortium. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/jabber-Jabber.yml b/tests/cluecode/data/copyrights/jabber-Jabber.yml
index 75fcd9bd30..beaa0f326d 100644
--- a/tests/cluecode/data/copyrights/jabber-Jabber.yml
+++ b/tests/cluecode/data/copyrights/jabber-Jabber.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Jeremie Miller
     count: 1
+allrights:
+  - Copyright (c) 1999-2000 Jabber.com, Inc. All Rights Reserved.
+  - Portions Copyright (c) 1998-1999 Jeremie Miller.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/java-java.java.yml b/tests/cluecode/data/copyrights/java-java.java.yml
index 3ccecfc58a..b167fd3025 100644
--- a/tests/cluecode/data/copyrights/java-java.java.yml
+++ b/tests/cluecode/data/copyrights/java-java.java.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: P.J. Plauger
     count: 1
+allrights:
+  - Copyright (c) 1992-2002 by P.J. Plauger. ALL RIGHTS RESERVED.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/jcraft_copyright.txt.yml b/tests/cluecode/data/copyrights/jcraft_copyright.txt.yml
index b44bae8405..97ae8881bb 100644
--- a/tests/cluecode/data/copyrights/jcraft_copyright.txt.yml
+++ b/tests/cluecode/data/copyrights/jcraft_copyright.txt.yml
@@ -3,3 +3,5 @@ what:
   - copyrights
 copyrights:
   - Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc.
+allrights:
+  - Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/jdoe-c.c.yml b/tests/cluecode/data/copyrights/jdoe-c.c.yml
index de07adae14..bde40b2acd 100644
--- a/tests/cluecode/data/copyrights/jdoe-c.c.yml
+++ b/tests/cluecode/data/copyrights/jdoe-c.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: J-Doe
     count: 1
+allrights:
+  - Copyright 2009 J-Doe. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/jpython-JPython.yml b/tests/cluecode/data/copyrights/jpython-JPython.yml
index dc5e3503b5..b511b479b9 100644
--- a/tests/cluecode/data/copyrights/jpython-JPython.yml
+++ b/tests/cluecode/data/copyrights/jpython-JPython.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Corporation for National Research Initiatives
     count: 1
+allrights:
+  - Copyright 1996-1999 Corporation for National Research Initiatives All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/jquery.flot.navigate.js.yml b/tests/cluecode/data/copyrights/jquery.flot.navigate.js.yml
index 4a9481c641..ae3039aaa8 100644
--- a/tests/cluecode/data/copyrights/jquery.flot.navigate.js.yml
+++ b/tests/cluecode/data/copyrights/jquery.flot.navigate.js.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: IOLA and Ole Laursen
     count: 1
+allrights:
+  - Copyright (c) 2007-2014 IOLA and Ole Laursen.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/larryrosen-LarryRosen.yml b/tests/cluecode/data/copyrights/larryrosen-LarryRosen.yml
index ab2ac228a6..a112170ccd 100644
--- a/tests/cluecode/data/copyrights/larryrosen-LarryRosen.yml
+++ b/tests/cluecode/data/copyrights/larryrosen-LarryRosen.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Lawrence E. Rosen
     count: 1
+allrights:
+  - Copyright (c) 2002 Lawrence E. Rosen. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/libadns1-libadns.copyright.yml b/tests/cluecode/data/copyrights/libadns1-libadns.copyright.yml
index 974287488e..adea638d8c 100644
--- a/tests/cluecode/data/copyrights/libadns1-libadns.copyright.yml
+++ b/tests/cluecode/data/copyrights/libadns1-libadns.copyright.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tony Finch
     count: 1
+allrights:
+  - Copyright 1997-2000 Ian Jackson
+  - Copyright 1999 Tony Finch
+  - Copyright (c) 1991 Massachusetts Institute of Technology.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/libc6_i686-libc_i.copyright.yml b/tests/cluecode/data/copyrights/libc6_i686-libc_i.copyright.yml
index fa3169e373..68587aa2bc 100644
--- a/tests/cluecode/data/copyrights/libc6_i686-libc_i.copyright.yml
+++ b/tests/cluecode/data/copyrights/libc6_i686-libc_i.copyright.yml
@@ -37,3 +37,12 @@ holders_summary:
     count: 1
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1991,92,93,94,95,96,97,98,99,2000,2001,2002,2003,2004,2005, 2006,2007,2008 Free Software Foundation, Inc.
+  - Copyright (c) 1991,92,93,94,95,96,97,98,99,2000,2001,2002,2003,2004,2005, 2006,2007,2008 Free Software Foundation, Inc.
+  - Copyright (c) 1991 Regents of the University of California. All rights reserved.
+  - Portions Copyright (c) 1993 by Digital Equipment Corporation.
+  - Copyright (c) 1984, Sun Microsystems, Inc.
+  - Copyright (c) 1991,1990,1989 Carnegie Mellon University All Rights Reserved.
+  - Copyright (c) 2000, Intel Corporation
+  - copyright (c) by Craig Metz
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/libcdio10-libcdio.label.yml b/tests/cluecode/data/copyrights/libcdio10-libcdio.label.yml
index e52246af6a..18f661dd0f 100644
--- a/tests/cluecode/data/copyrights/libcdio10-libcdio.label.yml
+++ b/tests/cluecode/data/copyrights/libcdio10-libcdio.label.yml
@@ -82,3 +82,23 @@ holders_summary:
     count: 1
   - value: Yggdrasil Computing, Incorporated
     count: 1
+allrights:
+  - Copyright (c) 1999, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Rocky Bernstein <rocky@gnu.org>
+  - Copyright (c) 2000, 2001, 2003, 2004, 2005, 2008 Herbert Valerio Riedel
+  - Copyright (c) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org>
+  - Copyright (c) 2001 Xiph.org
+  - Copyright (c) 1994, 1995, 1996, 1997, 1998, 2001 Heiko Eissfeldt <heiko@escape.colossus.de>
+  - Copyright (c) 1998, 1999, 2001 Monty <xiphmont@mit.edu>
+  - Copyright (c) 2008 Robert W. Fuller <hydrologiccycle@gmail.com>
+  - Copyright (c) 2006, 2008 Burkhard Plaum <plaum@ipf.uni-stuttgart.de>
+  - Copyright (c) 2001, 2002 Ben Fennema <bfennema@falcon.csc.calpoly.edu>
+  - Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
+  - Copyright (c) 1993 Yggdrasil Computing, Incorporated
+  - Copyright (c) 1999, 2000 J. Schilling
+  - Copyright (c) 2001 Sven Ottemann <ac-logic@freenet.de>
+  - Copyright (c) 2003 Svend Sanjay Sorensen <ssorensen@fastmail.fm>
+  - Copyright (c) 1985, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+  - Copyright (c) 2003 Matthias Drochner
+  - Copyright (c) 1998-2001 VideoLAN Johan Bilien <jobi@via.ecp.fr> and Gildas Bazin <gbazin@netcourrier.com>
+  - Copyright (c) 1992, 1993 Eric Youngdale
+  - Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008 Rocky Bernstein and Herbert Valerio Riedel.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/libcrypt_ssleay_perl-libcrypt_ssleay_perl.copyright.yml b/tests/cluecode/data/copyrights/libcrypt_ssleay_perl-libcrypt_ssleay_perl.copyright.yml
index 5aaaca8642..fc17395249 100644
--- a/tests/cluecode/data/copyrights/libcrypt_ssleay_perl-libcrypt_ssleay_perl.copyright.yml
+++ b/tests/cluecode/data/copyrights/libcrypt_ssleay_perl-libcrypt_ssleay_perl.copyright.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Stephen Zander
     count: 1
+allrights:
+  - Copyright (c) 1999-2003 Joshua Chamas.
+  - Copyright (c) 1998 Gisle Aas.
+  - copyright (c) 2003 Stephen Zander <gibreel@debian.org>
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/libgoffice_0_8-libgoffice.label.yml b/tests/cluecode/data/copyrights/libgoffice_0_8-libgoffice.label.yml
index c4d94670cf..4d9f2205de 100644
--- a/tests/cluecode/data/copyrights/libgoffice_0_8-libgoffice.label.yml
+++ b/tests/cluecode/data/copyrights/libgoffice_0_8-libgoffice.label.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jody Goldberg and others
     count: 1
+allrights:
+  - Copyright (c) 2003-2008 Jody Goldberg (jody@gnome.org) and others.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/libisc44-libisc.copyright.yml b/tests/cluecode/data/copyrights/libisc44-libisc.copyright.yml
index 5b1be28537..5a51269879 100644
--- a/tests/cluecode/data/copyrights/libisc44-libisc.copyright.yml
+++ b/tests/cluecode/data/copyrights/libisc44-libisc.copyright.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Internet Software Consortium
     count: 1
+allrights:
+  - Copyright (c) 1996-2001 Internet Software Consortium.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/libisccfg30-libisccfg.copyright.yml b/tests/cluecode/data/copyrights/libisccfg30-libisccfg.copyright.yml
index 5b1be28537..5a51269879 100644
--- a/tests/cluecode/data/copyrights/libisccfg30-libisccfg.copyright.yml
+++ b/tests/cluecode/data/copyrights/libisccfg30-libisccfg.copyright.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Internet Software Consortium
     count: 1
+allrights:
+  - Copyright (c) 1996-2001 Internet Software Consortium.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/libisccfg40-libisccfg.copyright.yml b/tests/cluecode/data/copyrights/libisccfg40-libisccfg.copyright.yml
index 5b1be28537..5a51269879 100644
--- a/tests/cluecode/data/copyrights/libisccfg40-libisccfg.copyright.yml
+++ b/tests/cluecode/data/copyrights/libisccfg40-libisccfg.copyright.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Internet Software Consortium
     count: 1
+allrights:
+  - Copyright (c) 1996-2001 Internet Software Consortium.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/libjpeg62-libjpeg.copyright.yml b/tests/cluecode/data/copyrights/libjpeg62-libjpeg.copyright.yml
index d2d234661a..32885858d8 100644
--- a/tests/cluecode/data/copyrights/libjpeg62-libjpeg.copyright.yml
+++ b/tests/cluecode/data/copyrights/libjpeg62-libjpeg.copyright.yml
@@ -25,3 +25,9 @@ holders_summary:
     count: 1
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - copyright (c) 1991-1998, Thomas G. Lane. All Rights Reserved
+  - copyright holder, Aladdin Enterprises of Menlo Park
+  - copyright by the Free Software Foundation
+  - copyright by M.I.T.
+  - Copyright property of CompuServe Incorporated.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/liblocale_gettext_perl-liblocale_get_perl.label.yml b/tests/cluecode/data/copyrights/liblocale_gettext_perl-liblocale_get_perl.label.yml
index e9062fec3e..22c1f6d2af 100644
--- a/tests/cluecode/data/copyrights/liblocale_gettext_perl-liblocale_get_perl.label.yml
+++ b/tests/cluecode/data/copyrights/liblocale_gettext_perl-liblocale_get_perl.label.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Phillip Vandry
     count: 1
+allrights:
+  - Copyright 1996..2005 by Phillip Vandry <vandry@TZoNE.ORG> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/libopenraw1-libopenraw.label.yml b/tests/cluecode/data/copyrights/libopenraw1-libopenraw.label.yml
index 0d5a816dc6..aa0b186d35 100644
--- a/tests/cluecode/data/copyrights/libopenraw1-libopenraw.label.yml
+++ b/tests/cluecode/data/copyrights/libopenraw1-libopenraw.label.yml
@@ -37,3 +37,14 @@ holders_summary:
     count: 1
   - value: Thomas G. Lane, Part of the Independent JPEG Group's
     count: 1
+allrights:
+  - Copyright (c) 2007, David Paleino <d.paleino@gmail.com>
+  - Copyright (c) 2005-2009, Hubert Figuiere <hub@figuiere.net>
+  - Copyright (c) 2006, Hubert Figuiere <hub@figuiere.net>
+  - (c) 2001, Lutz Muller <lutz@users.sourceforge.net>
+  - Copyright (c) 2007, Hubert Figuiere <hub@figuiere.net>
+  - (c) 1994, Kongji Huang and Brian C. Smith, Cornell University. All rights reserved.
+  - (c) 1993, Brian C. Smith, The Regents of the University of California. All rights reserved.
+  - (c) 1991-1992, Thomas G. Lane, Part of the Independent JPEG Group's
+  - Copyright (c) 2005, Hubert Figuiere <hub@figuiere.net>
+  - Copyright (c) 2007, Hubert Figuiere <hub@figuiere.net>
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/libopenthreads12-libopenthreads.copyright.yml b/tests/cluecode/data/copyrights/libopenthreads12-libopenthreads.copyright.yml
index 80403d1898..269b1e1f08 100644
--- a/tests/cluecode/data/copyrights/libopenthreads12-libopenthreads.copyright.yml
+++ b/tests/cluecode/data/copyrights/libopenthreads12-libopenthreads.copyright.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Robert Osfield
     count: 1
+allrights:
+  - Copyright (c) 2002 Robert Osfield.
+  - Copyright (c) 1998 Julian Smart, Robert Roebling
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/libqt4_scripttools-libqt_scripttools.copyright.yml b/tests/cluecode/data/copyrights/libqt4_scripttools-libqt_scripttools.copyright.yml
index 2356490691..2f65f8b6d6 100644
--- a/tests/cluecode/data/copyrights/libqt4_scripttools-libqt_scripttools.copyright.yml
+++ b/tests/cluecode/data/copyrights/libqt4_scripttools-libqt_scripttools.copyright.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Trolltech ASA.
     count: 1
+allrights:
+  - Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+  - (c) 1994-2008 Trolltech ASA.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/libqtscript4_gui-libqtscript_gui.copyright.yml b/tests/cluecode/data/copyrights/libqtscript4_gui-libqtscript_gui.copyright.yml
index 488aeaa2b9..fa3aeccd1f 100644
--- a/tests/cluecode/data/copyrights/libqtscript4_gui-libqtscript_gui.copyright.yml
+++ b/tests/cluecode/data/copyrights/libqtscript4_gui-libqtscript_gui.copyright.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: Trolltech ASA.
     count: 1
+allrights:
+  - Copyright (c) 2009 Modestas Vainius <modestas@vainius.eu>
+  - Copyright (c) Trolltech ASA. All Rights Reserved.
+  - Copyright (c) Roberto Raggi <roberto@kdevelop.org>
+  - Copyright (c) Harald Fernengel <harry@kdevelop.org>
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/libsocks4-libsocks.copyright.yml b/tests/cluecode/data/copyrights/libsocks4-libsocks.copyright.yml
index 3ef6178841..281db8829e 100644
--- a/tests/cluecode/data/copyrights/libsocks4-libsocks.copyright.yml
+++ b/tests/cluecode/data/copyrights/libsocks4-libsocks.copyright.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1989 Regents of the University of California. All rights reserved.
+  - Portions Copyright (c) 1993, 1994, 1995 by NEC Systems Laboratory.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/libuim6-libuim.copyright.yml b/tests/cluecode/data/copyrights/libuim6-libuim.copyright.yml
index f10823f446..5e9f6d7a45 100644
--- a/tests/cluecode/data/copyrights/libuim6-libuim.copyright.yml
+++ b/tests/cluecode/data/copyrights/libuim6-libuim.copyright.yml
@@ -45,3 +45,14 @@ holders_summary:
     count: 1
   - value: uim Project
     count: 1
+allrights:
+  - Copyright (c) 2003-2007 uim Project http://uim.freedesktop.org
+  - COPYRIGHT (c) 1988-1994 BY PARADIGM ASSOCIATES INCORPORATED, CAMBRIDGE, MASSACHUSETTS. ALL RIGHTS RESERVED
+  - Copyright (c) 2006, SHIMODA Hiroshi <piro@p.club.ne.jp>
+  - Copyright (c) 2006, FUJITA Yuji <yuji@webmasters.gr.jp>
+  - Copyright (c) 2006, Jun Mukai <mukai@jmuk.org>
+  - Copyright (c) 2006, Teppei Tamra <tam-t@par.odn.ne.jp>
+  - Copyright (c) 2005 UTUMI Hirosi <utuhiro78@yahoo.co.jp>
+  - Copyright (c) 2006 YAMAMOTO Kengo <yamaken@bp.iij4u.or.jp>
+  - Copyright (c) 2006 Jae-hyeon Park <jhyeon@gmail.com>
+  - Copyright (c) 2006 Etsushi Kato <ek.kato@gmail.com> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/libxext6-libxext.copyright.yml b/tests/cluecode/data/copyrights/libxext6-libxext.copyright.yml
index 4fc295343a..b040811311 100644
--- a/tests/cluecode/data/copyrights/libxext6-libxext.copyright.yml
+++ b/tests/cluecode/data/copyrights/libxext6-libxext.copyright.yml
@@ -44,3 +44,13 @@ holders_summary:
     count: 1
   - value: The Open Group
     count: 1
+allrights:
+  - Copyright 1986, 1987, 1988, 1989, 1994, 1998 The Open Group
+  - Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts.
+  - Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc.
+  - Copyright 1992 Network Computing Devices
+  - Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts, and Olivetti Research Limited, Cambridge, England.
+  - Copyright 1986, 1987, 1988 by Hewlett-Packard Corporation
+  - Copyright (c) 1994, 1995 Hewlett-Packard Company
+  - Copyright Digital Equipment Corporation, 1996
+  - Copyright 1999, 2005, 2006 Sun Microsystems, Inc. All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/libxmlrpc_c3-libxmlrpc_c.copyright.yml b/tests/cluecode/data/copyrights/libxmlrpc_c3-libxmlrpc_c.copyright.yml
index 0c1931fc18..36a2d3b747 100644
--- a/tests/cluecode/data/copyrights/libxmlrpc_c3-libxmlrpc_c.copyright.yml
+++ b/tests/cluecode/data/copyrights/libxmlrpc_c3-libxmlrpc_c.copyright.yml
@@ -25,3 +25,9 @@ holders_summary:
     count: 1
   - value: Thai Open Source Software Center Ltd
     count: 1
+allrights:
+  - Copyright (c) 2001 by First Peer, Inc. All rights reserved.
+  - Copyright (c) 2001 by Eric Kidd. All rights reserved.
+  - Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+  - Copyright (c) 2000 by Moez Mahfoudh <mmoez@bigfoot.com> All rights reserved.
+  - Copyright 1991, 1992, 1993, 1994 by Stichting Mathematisch Centrum, Amsterdam
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/libxt6-libxt.label.yml b/tests/cluecode/data/copyrights/libxt6-libxt.label.yml
index 006e1092e4..4a30a4be95 100644
--- a/tests/cluecode/data/copyrights/libxt6-libxt.label.yml
+++ b/tests/cluecode/data/copyrights/libxt6-libxt.label.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: The Open Group
     count: 1
+allrights:
+  - Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts
+  - Copyright 1993 by Sun Microsystems, Inc. Mountain View
+  - Copyright 1985, 1986, 1987, 1988, 1989, 1994, 1998, 2001 The Open Group
+  - (c) COPYRIGHT International Business Machines Corp. 1992,1997 All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/license_qpl_v1_0_perfect-QPL_v.0.yml b/tests/cluecode/data/copyrights/license_qpl_v1_0_perfect-QPL_v.0.yml
index 4805d430d8..88623fb494 100644
--- a/tests/cluecode/data/copyrights/license_qpl_v1_0_perfect-QPL_v.0.yml
+++ b/tests/cluecode/data/copyrights/license_qpl_v1_0_perfect-QPL_v.0.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Trolltech AS, Norway
     count: 1
+allrights:
+  - Copyright (c) 1999 Trolltech AS, Norway.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/linux_source_2_6-linux_source.copyright.yml b/tests/cluecode/data/copyrights/linux_source_2_6-linux_source.copyright.yml
index 59f3f997d8..059f130552 100644
--- a/tests/cluecode/data/copyrights/linux_source_2_6-linux_source.copyright.yml
+++ b/tests/cluecode/data/copyrights/linux_source_2_6-linux_source.copyright.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Linus Torvalds and others
     count: 1
+allrights:
+  - copyrighted by Linus Torvalds and others.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/logica_v1_0-Logica_v.0.yml b/tests/cluecode/data/copyrights/logica_v1_0-Logica_v.0.yml
index 4116269d99..b2f44cdce3 100644
--- a/tests/cluecode/data/copyrights/logica_v1_0-Logica_v.0.yml
+++ b/tests/cluecode/data/copyrights/logica_v1_0-Logica_v.0.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Logica Mobile Networks Limited
     count: 2
+allrights:
+  - Copyright (c) 1996-2001 Logica Mobile Networks Limited, all rights reserved.
+  - Copyright (c) 1996-2001 Logica Mobile Networks Limited
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/long_holder_name.txt.yml b/tests/cluecode/data/copyrights/long_holder_name.txt.yml
index 8784bc6c3e..f6d55cd479 100644
--- a/tests/cluecode/data/copyrights/long_holder_name.txt.yml
+++ b/tests/cluecode/data/copyrights/long_holder_name.txt.yml
@@ -11,4 +11,5 @@ expected_failures:
   - copyrights
   - holders
 notes: we should not detect very long names
-  
\ No newline at end of file
+allrights:
+  - Copyright (c) 2000-2021 Adolph Blaine Charles David Earl Frederick Gerald Hubert Irvin John Kenneth Lloyd Martin Nero Oliver Paul Quincy Randolph Sherman Thomas Uncas Victor William Xerxes Yancy Zeus Wolfeschlegelsteinhausenbergerdorffwelchevoralternwarengewissenhaftschaferswessenschafewarenwohlgepflegeundsorgfaltigkeitbeschutzenvonangreifendurchihrraubgierigfeindewelchevoralternzwolftausendjahresvorandieerscheinenvanderersteerdemenschderraumschiffgebrauchlichtalsseinursprungvonkraftgestartseinlangefahrthinzwischensternartigraumaufdersuchenachdiesternwelchegehabtbewohnbarplanetenkreisedrehensichundwohinderneurassevonverstandigmenschlichkeitkonntefortpflanzenundsicherfreuenanlebenslanglichfreudeundruhemitnichteinfurchtvorangreifenvonandererintelligentgeschopfsvonhinzwischensternartigraum
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/long_name.txt.yml b/tests/cluecode/data/copyrights/long_name.txt.yml
index 130a851020..c2ff99d137 100644
--- a/tests/cluecode/data/copyrights/long_name.txt.yml
+++ b/tests/cluecode/data/copyrights/long_name.txt.yml
@@ -11,4 +11,6 @@ holders:
 expected_failures:
   - copyrights
   - holders
-notes: we should not detect very long names
\ No newline at end of file
+notes: we should not detect very long names
+allrights:
+  - Copyright (c) 2021 Adolph Blaine Charles David Earl Frederick Gerald Hubert Irvin John Kenneth Lloyd Martin Nero Oliver Paul Quincy Randolph Sherman Thomas Uncas Victor William Xerxes Yancy Zeus Wolfeschlegelsteinhausenbergerdorffwelchevoralternwarengewissenhaftschaferswessenschafewarenwohlgepflegeundsorgfaltigkeitbeschutzenvonangreifendurchihrraubgierigfeindewelchevoralternzwolftausendjahresvorandieerscheinenvanderersteerdemenschderraumschiffgebrauchlichtalsseinursprungvonkraftgestartseinlangefahrthinzwischensternartigraumaufdersuchenachdiesternwelchegehabtbewohnbarplanetenkreisedrehensichundwohinderneurassevonverstandigmenschlichkeitkonntefortpflanzenundsicherfreuenanlebenslanglichfreudeundruhemitnichteinfurchtvorangreifenvonandererintelligentgeschopfsvonhinzwischensternartigraum
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/luxi_fonts-Luxi_fonts.yml b/tests/cluecode/data/copyrights/luxi_fonts-Luxi_fonts.yml
index 5167539d17..6e28d97361 100644
--- a/tests/cluecode/data/copyrights/luxi_fonts-Luxi_fonts.yml
+++ b/tests/cluecode/data/copyrights/luxi_fonts-Luxi_fonts.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: URW++ GmbH.
     count: 1
+allrights:
+  - copyright (c) 2001 by Bigelow & Holmes Inc.
+  - copyright (c) 2001 by URW++ GmbH. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/maia-Maia.yml b/tests/cluecode/data/copyrights/maia-Maia.yml
index cb16aca93a..e36cd04e14 100644
--- a/tests/cluecode/data/copyrights/maia-Maia.yml
+++ b/tests/cluecode/data/copyrights/maia-Maia.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Robert LeBlanc
     count: 1
+allrights:
+  - Copyright 2004 by Robert LeBlanc All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/man_page.txt.yml b/tests/cluecode/data/copyrights/man_page.txt.yml
index f0d004b7bd..b74dad931b 100644
--- a/tests/cluecode/data/copyrights/man_page.txt.yml
+++ b/tests/cluecode/data/copyrights/man_page.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Free Software Foundation, Inc., and others
     count: 1
+allrights:
+  - Copyright 2001-2017 Free Software Foundation, Inc., and others.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/math.c.yml b/tests/cluecode/data/copyrights/math.c.yml
index bb0ec0b7c1..b8dc5618d6 100644
--- a/tests/cluecode/data/copyrights/math.c.yml
+++ b/tests/cluecode/data/copyrights/math.c.yml
@@ -25,3 +25,9 @@ holders_summary:
     count: 1
   - value: Vladimir Oleynik <dzo@simtreas.ru>
     count: 1
+allrights:
+  - Copyright (c) 1989, 1991, 1993, 1994 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 1997-2005 Herbert Xu <herbert@gondor.apana.org.au>
+  - Copyright (c) 2001 Aaron Lehmann <aaronl@vitelus.com>
+  - Paul Mundt <lethal@linux-sh.org> (c) 2004
+  - Vladimir Oleynik <dzo@simtreas.ru> (c) 2001-2005
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/maven_pom_xstream-pom_xml.xml.yml b/tests/cluecode/data/copyrights/maven_pom_xstream-pom_xml.xml.yml
index 6a309e4f6d..d137647966 100644
--- a/tests/cluecode/data/copyrights/maven_pom_xstream-pom_xml.xml.yml
+++ b/tests/cluecode/data/copyrights/maven_pom_xstream-pom_xml.xml.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: XStream committers
     count: 1
+allrights:
+  - Copyright (c) 2006 Joe Walnes.
+  - Copyright (c) 2006, 2007, 2008 XStream committers. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/mergesort_java-MergeSort_java.java.yml b/tests/cluecode/data/copyrights/mergesort_java-MergeSort_java.java.yml
index 7fac18ec53..47beb793f8 100644
--- a/tests/cluecode/data/copyrights/mergesort_java-MergeSort_java.java.yml
+++ b/tests/cluecode/data/copyrights/mergesort_java-MergeSort_java.java.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Sun Microsystems
     count: 1
+allrights:
+  - Copyright (c) 1998 Sun Microsystems, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/mips1_be_elf_hal_o_uu-mips_be_elf_hal_o_uu.uu.yml b/tests/cluecode/data/copyrights/mips1_be_elf_hal_o_uu-mips_be_elf_hal_o_uu.uu.yml
index aff285c3c1..38c56bf146 100644
--- a/tests/cluecode/data/copyrights/mips1_be_elf_hal_o_uu-mips_be_elf_hal_o_uu.uu.yml
+++ b/tests/cluecode/data/copyrights/mips1_be_elf_hal_o_uu-mips_be_elf_hal_o_uu.uu.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Sam Leffler, Errno Consulting, Atheros Communications, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros Communications, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco/allrisghts.txt.yml b/tests/cluecode/data/copyrights/misco/allrisghts.txt.yml
index a99776f87e..ee79273ca5 100644
--- a/tests/cluecode/data/copyrights/misco/allrisghts.txt.yml
+++ b/tests/cluecode/data/copyrights/misco/allrisghts.txt.yml
@@ -5,3 +5,5 @@ copyrights:
   - Copyright (c) 2008 by Amalasoft Corporation
 holders:
   - Amalasoft Corporation
+allrights:
+  - Copyright (c) 2008 All rights reserved by Amalasoft Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco/cali_1.txt.yml b/tests/cluecode/data/copyrights/misco/cali_1.txt.yml
index defd06728a..2efe45dade 100644
--- a/tests/cluecode/data/copyrights/misco/cali_1.txt.yml
+++ b/tests/cluecode/data/copyrights/misco/cali_1.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 1988, 1993 The Regents of the University ofCalifornia
 holders:
   - The Regents of the University ofCalifornia
+allrights:
+  - Copyright (c) 1988, 1993 The Regents of the University ofCalifornia. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco/cip4.txt.yml b/tests/cluecode/data/copyrights/misco/cip4.txt.yml
index 425e73c5aa..c1b1478e70 100644
--- a/tests/cluecode/data/copyrights/misco/cip4.txt.yml
+++ b/tests/cluecode/data/copyrights/misco/cip4.txt.yml
@@ -8,3 +8,5 @@ copyrights:
 holders:
   - The International Cooperation for the Integration of Processes in Prepress, Press and Postpress
     (CIP4)
+allrights:
+  - Copyright (c) The International Cooperation for the Integration of Processes in Prepress, Press and Postpress (CIP4). All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco/codehaus.txt.yml b/tests/cluecode/data/copyrights/misco/codehaus.txt.yml
index 7a317881e4..8339348b1c 100644
--- a/tests/cluecode/data/copyrights/misco/codehaus.txt.yml
+++ b/tests/cluecode/data/copyrights/misco/codehaus.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright 2002 (c) The Codehaus
 holders:
   - The Codehaus
+allrights:
+  - Copyright 2002 (c) The Codehaus. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco/french-1.txt.yml b/tests/cluecode/data/copyrights/misco/french-1.txt.yml
index 8f81c2ffbb..c6f600f83c 100644
--- a/tests/cluecode/data/copyrights/misco/french-1.txt.yml
+++ b/tests/cluecode/data/copyrights/misco/french-1.txt.yml
@@ -5,3 +5,5 @@ copyrights:
   - Engie (c) COPYRIGHT 2020
 holders:
   - Engie
+allrights:
+  - Engie (c) COPYRIGHT 2020 - Tous Droits Reserves
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco/german-1.txt.yml b/tests/cluecode/data/copyrights/misco/german-1.txt.yml
index 348ec2c996..307e97492c 100644
--- a/tests/cluecode/data/copyrights/misco/german-1.txt.yml
+++ b/tests/cluecode/data/copyrights/misco/german-1.txt.yml
@@ -5,3 +5,5 @@ copyrights:
   - Copyright (x) 1998-2021 ActiveVB.
 holders:
   - ActiveVB
+allrights:
+  - Copyright (x) 1998-2021 ActiveVB. Alle Rechte vorbehalten.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco/open-contributors.txt.yml b/tests/cluecode/data/copyrights/misco/open-contributors.txt.yml
index 901a8256a8..26f6b32e58 100644
--- a/tests/cluecode/data/copyrights/misco/open-contributors.txt.yml
+++ b/tests/cluecode/data/copyrights/misco/open-contributors.txt.yml
@@ -2,3 +2,5 @@ what:
   - copyrights
 copyrights:
   - Copyright (c) 2019-2021, Open source contributors
+allrights:
+  - Copyright (c) 2019-2021, Open source contributors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco/w3c_1.txt.yml b/tests/cluecode/data/copyrights/misco/w3c_1.txt.yml
index b8435f8135..800ba3442e 100644
--- a/tests/cluecode/data/copyrights/misco/w3c_1.txt.yml
+++ b/tests/cluecode/data/copyrights/misco/w3c_1.txt.yml
@@ -8,3 +8,5 @@ copyrights:
 holders:
   - World Wide Web Consortium, (Massachusetts Institute of Technology , Institut National de
     Recherche en Informatique et en Automatique, Keio University
+allrights:
+  - Copyright (c) World Wide Web Consortium, (Massachusetts Institute of Technology , Institut National de Recherche en Informatique et en Automatique, Keio University ). All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/antarctic.txt.yml b/tests/cluecode/data/copyrights/misco2/antarctic.txt.yml
index 7f1f7ad970..3617606174 100644
--- a/tests/cluecode/data/copyrights/misco2/antarctic.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/antarctic.txt.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Bryan Scott (for Australian Antarctic Division)
     count: 1
+allrights:
+  - (c) Copyright 2003, 2004, by Bryan Scott (for Australian Antarctic Division).
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/arizona.txt.yml b/tests/cluecode/data/copyrights/misco2/arizona.txt.yml
index 995fa41fb0..0f97c961ef 100644
--- a/tests/cluecode/data/copyrights/misco2/arizona.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/arizona.txt.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Arizona Board of Regents (University of Arizona)
     count: 1
+allrights:
+  - Copyright (c) 2005-2006 Arizona Board of Regents (University of Arizona). All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/ayman.txt.yml b/tests/cluecode/data/copyrights/misco2/ayman.txt.yml
index 10675d09fa..8ef78324b7 100644
--- a/tests/cluecode/data/copyrights/misco2/ayman.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/ayman.txt.yml
@@ -14,3 +14,6 @@ holders_summary:
     count: 1
   - value: Hanns Holger Rutz
     count: 1
+allrights:
+  - Copyright (c) by Ayman Al-Sairafi
+  - Copyright (c) 2011-2015 by Hanns Holger Rutz.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/bsdnrl-BSDNRL.yml b/tests/cluecode/data/copyrights/misco2/bsdnrl-BSDNRL.yml
index 1b1b5945a3..13744fbedf 100644
--- a/tests/cluecode/data/copyrights/misco2/bsdnrl-BSDNRL.yml
+++ b/tests/cluecode/data/copyrights/misco2/bsdnrl-BSDNRL.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - copyright by The Regents of the University of California. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/chinese_char.txt.yml b/tests/cluecode/data/copyrights/misco2/chinese_char.txt.yml
index a20e9080c1..4499b4bd7b 100644
--- a/tests/cluecode/data/copyrights/misco2/chinese_char.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/chinese_char.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: 2016Nian Allen
     count: 1
+allrights:
+  - Copyright (c) 2016Nian Allen. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/contributing-members.txt.yml b/tests/cluecode/data/copyrights/misco2/contributing-members.txt.yml
index 2187849e9a..64fd2bfb69 100644
--- a/tests/cluecode/data/copyrights/misco2/contributing-members.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/contributing-members.txt.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Contributing Member(s) of Distributed Management Task Force, Inc
     count: 1
+allrights:
+  - Copyright (c) 2017, Contributing Member(s) of Distributed Management Task Force, Inc.. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/copyrighted-by-colon.txt.yml b/tests/cluecode/data/copyrights/misco2/copyrighted-by-colon.txt.yml
index 971e15be15..d9e2e33ef7 100644
--- a/tests/cluecode/data/copyrights/misco2/copyrighted-by-colon.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/copyrighted-by-colon.txt.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Sun Microsystems
     count: 1
+allrights:
+  - Copyright (c) 2003 Sun Microsystems, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/copyrighted-complex.txt.yml b/tests/cluecode/data/copyrights/misco2/copyrighted-complex.txt.yml
index e2032d719b..de9cb65d6a 100644
--- a/tests/cluecode/data/copyrights/misco2/copyrighted-complex.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/copyrighted-complex.txt.yml
@@ -15,3 +15,5 @@ holders_summary:
   - value: Douglas C. Schmidt and his research group at Washington University, University of
       California, Irvine, and Vanderbilt University
     count: 1
+allrights:
+  - copyrighted by http://www.dre.vanderbilt.edu/~schmidt/ Douglas C. Schmidt and his http://www.cs.wustl.edu/~schmidt/ACE-members.html research group at http://www.wustl.edu/ Washington University, http://www.uci.edu University of California, Irvine, and http://www.vanderbilt.edu Vanderbilt University, Copyright (c) 1993-2009, all rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/distributed_1.txt.yml b/tests/cluecode/data/copyrights/misco2/distributed_1.txt.yml
index 8e6a8b9977..2cca606020 100644
--- a/tests/cluecode/data/copyrights/misco2/distributed_1.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/distributed_1.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Distributed Frontera developers
     count: 1
+allrights:
+  - Copyright (c) Distributed Frontera developers. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/distributed_10.txt.yml b/tests/cluecode/data/copyrights/misco2/distributed_10.txt.yml
index ae9bb8c7b7..2f6ff3099b 100644
--- a/tests/cluecode/data/copyrights/misco2/distributed_10.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/distributed_10.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Distributed InforMation ProcBssing Ltd.
     count: 1
+allrights:
+  - Copyright (c) Distributed InforMation ProcBssing Ltd. Alle Rechte Vorbehalten
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/distributed_4.txt.yml b/tests/cluecode/data/copyrights/misco2/distributed_4.txt.yml
index 7d8747fc2e..2a4a8321ce 100644
--- a/tests/cluecode/data/copyrights/misco2/distributed_4.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/distributed_4.txt.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Gregory Popovitch
     count: 1
+allrights:
+  - (c) 2019-2023 Gregory Popovitch.
+  - (c) Distributed Ledger Technology Collaboration and contributors.
+  - (c) 2017-2023 Bartosz Taudul.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/distributed_6.txt.yml b/tests/cluecode/data/copyrights/misco2/distributed_6.txt.yml
index c57a942aad..cfb5ff4b28 100644
--- a/tests/cluecode/data/copyrights/misco2/distributed_6.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/distributed_6.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Distributed Processing Technology Corporation
     count: 1
+allrights:
+  - Copyright (c) 1996-1999 Distributed Processing Technology Corporation All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/distributed_7.txt.yml b/tests/cluecode/data/copyrights/misco2/distributed_7.txt.yml
index 248d9aa430..62c78fb1b2 100644
--- a/tests/cluecode/data/copyrights/misco2/distributed_7.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/distributed_7.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: distributed processing technology corporation
     count: 1
+allrights:
+  - Copyright (c) distributed processing technology corporation all rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/distributed_8.txt.yml b/tests/cluecode/data/copyrights/misco2/distributed_8.txt.yml
index 757e7168ef..e7b9c293cc 100644
--- a/tests/cluecode/data/copyrights/misco2/distributed_8.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/distributed_8.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Distributed via COMTEX News. YYYY A&G Information Services
     count: 1
+allrights:
+  - (c) Distributed via COMTEX News. (c) YYYY A&G Information Services, all rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/distributed_9.txt.yml b/tests/cluecode/data/copyrights/misco2/distributed_9.txt.yml
index 39eb454be8..a8780064f2 100644
--- a/tests/cluecode/data/copyrights/misco2/distributed_9.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/distributed_9.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Distributed Software System Lab
     count: 1
+allrights:
+  - Copyright (c) Distributed Software System Lab. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/dtmf-contrib.txt.yml b/tests/cluecode/data/copyrights/misco2/dtmf-contrib.txt.yml
index 2187849e9a..64fd2bfb69 100644
--- a/tests/cluecode/data/copyrights/misco2/dtmf-contrib.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/dtmf-contrib.txt.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Contributing Member(s) of Distributed Management Task Force, Inc
     count: 1
+allrights:
+  - Copyright (c) 2017, Contributing Member(s) of Distributed Management Task Force, Inc.. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/email-name.txt.yml b/tests/cluecode/data/copyrights/misco2/email-name.txt.yml
index 6a805ca839..4db0679a23 100644
--- a/tests/cluecode/data/copyrights/misco2/email-name.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/email-name.txt.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Roy Marples
     count: 1
+allrights:
+  - Copyright (c) 2006-2010 Roy Marples <roy@marples.name> All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/fiat.txt.yml b/tests/cluecode/data/copyrights/misco2/fiat.txt.yml
index 93a4a18ff5..b38ecaaea2 100644
--- a/tests/cluecode/data/copyrights/misco2/fiat.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/fiat.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: the fiat-crypto authors see
     count: 1
+allrights:
+  - Copyright (c) 2015-2016 the fiat-crypto authors (see https://github.com/mit-plv/fiat-crypto/blob/master/AUTHORS).
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/font-awesome.txt.yml b/tests/cluecode/data/copyrights/misco2/font-awesome.txt.yml
index 1e432dd9a5..b31ae4c69b 100644
--- a/tests/cluecode/data/copyrights/misco2/font-awesome.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/font-awesome.txt.yml
@@ -20,3 +20,8 @@ holders_summary:
     count: 1
   - value: glyphicon-copyright-mark Rubix
     count: 1
+allrights:
+  - Copyright fa-copyright 2020 by the authors
+  - Copyright 2022, LLC
+  - Copyright glyphicon-copyright-mark http://www.dalegroup.net
+  - Copyright glyphicon-copyright-mark 1998 - 2014 Rubix. Alle rechten voorbehouden.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/html_allright.txt.yml b/tests/cluecode/data/copyrights/misco2/html_allright.txt.yml
index 3b0a556e96..d34d07a5bd 100644
--- a/tests/cluecode/data/copyrights/misco2/html_allright.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/html_allright.txt.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: CKSource Holding sp. z o.o.
     count: 1
+allrights:
+  - Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/jpnic.txt.yml b/tests/cluecode/data/copyrights/misco2/jpnic.txt.yml
index 8602bfede8..c013c4fdc1 100644
--- a/tests/cluecode/data/copyrights/misco2/jpnic.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/jpnic.txt.yml
@@ -18,3 +18,8 @@ holders_summary:
     count: 3
   - value: Japan Registry Services Co., Ltd.
     count: 1
+allrights:
+  - Copyright (c) 2000-2002 Japan Network Information Center. All rights reserved.
+  - Copyright (c) 2000-2002 Japan Network Information Center. All rights reserved.
+  - Copyright (c) 2000-2002 Japan Network Information Center. All rights reserved.
+  - Copyright (c) 2010-2012 Japan Registry Services Co., Ltd. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/knowledge.txt.yml b/tests/cluecode/data/copyrights/misco2/knowledge.txt.yml
index de99c95725..b76cda1a87 100644
--- a/tests/cluecode/data/copyrights/misco2/knowledge.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/knowledge.txt.yml
@@ -18,3 +18,7 @@ holders_summary:
     count: 1
   - value: Knowledge Research and its affiliates
     count: 1
+allrights:
+  - Copyright (c) Knowledge Research and its affiliates. All Rights Reserved
+  - Copyright (c) Knowledge & Experience. All rights reserved.
+  - Copyright (c) Knowledge Computing Corp. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/myconame.txt.yml b/tests/cluecode/data/copyrights/misco2/myconame.txt.yml
index d473c7e36b..223a14a0b0 100644
--- a/tests/cluecode/data/copyrights/misco2/myconame.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/myconame.txt.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: MyCompanyName
     count: 1
+allrights:
+  - Copyright 2005 MyCompanyName . All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/nick.txt.yml b/tests/cluecode/data/copyrights/misco2/nick.txt.yml
index f2ace8d1fe..e16fc60c85 100644
--- a/tests/cluecode/data/copyrights/misco2/nick.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/nick.txt.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Nick Galbreath
     count: 1
+allrights:
+  - Copyright (c) 2005, 2006 Nick Galbreath - nickg at modp dot com All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/ocaml.txt.yml b/tests/cluecode/data/copyrights/misco2/ocaml.txt.yml
index a6198a7209..1488b746e6 100644
--- a/tests/cluecode/data/copyrights/misco2/ocaml.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/ocaml.txt.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: OCamlPro
     count: 1
+allrights:
+  - Copyright 2013-2020 by OCamlPro.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/opyright-baidu.txt.yml b/tests/cluecode/data/copyrights/misco2/opyright-baidu.txt.yml
index 8233f92b1c..8c2686e95c 100644
--- a/tests/cluecode/data/copyrights/misco2/opyright-baidu.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/opyright-baidu.txt.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Baidu Inc.
     count: 1
+allrights:
+  - opyright 2014 Baidu Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/osm.txt.yml b/tests/cluecode/data/copyrights/misco2/osm.txt.yml
index 06cf18ea90..e0b064af5e 100644
--- a/tests/cluecode/data/copyrights/misco2/osm.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/osm.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: OpenStreetMap contributors
     count: 1
+allrights:
+  - (c) OpenStreetMap contributors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/partners.txt.yml b/tests/cluecode/data/copyrights/misco2/partners.txt.yml
index 7d35cee9bf..93f9cc94d4 100644
--- a/tests/cluecode/data/copyrights/misco2/partners.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/partners.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 1999/2000 JJ2000 Partners
 holders:
   - JJ2000 Partners
+allrights:
+  - Copyright (c) 1999/2000 JJ2000 Partners.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/portion-copyright.txt.yml b/tests/cluecode/data/copyrights/misco2/portion-copyright.txt.yml
index 8ec9d803d1..9597423f61 100644
--- a/tests/cluecode/data/copyrights/misco2/portion-copyright.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/portion-copyright.txt.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Carl E. Harris
     count: 1
+allrights:
+  - copyrighted by Carl E. Harris, 1993 and 1995.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/refinery-and-contribs.txt.yml b/tests/cluecode/data/copyrights/misco2/refinery-and-contribs.txt.yml
index f32043987b..03a3cd83b9 100644
--- a/tests/cluecode/data/copyrights/misco2/refinery-and-contribs.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/refinery-and-contribs.txt.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Object Refinery Limited and Contributors
     count: 1
+allrights:
+  - Copyright (c) 2000-2013, by Object Refinery Limited and Contributors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-002.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-002.txt.yml
index e07b2f7ca0..175e612e05 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-002.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-002.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2013-2015, 2016, Jon Schlinkert
 holders:
   - Jon Schlinkert
+allrights:
+  - Copyright (c) 2013-2015, 2016, Jon Schlinkert.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-003.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-003.txt.yml
index b41f97a0a8..49da82bf72 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-003.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-003.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright 2013-2015 Jon Schlinkert
 holders:
   - Jon Schlinkert
+allrights:
+  - Copyright 2013-2015 Jon Schlinkert.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-005.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-005.txt.yml
index aa1ab9a73a..c6d9f562e5 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-005.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-005.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) Jon Schlinkert
 holders:
   - Jon Schlinkert
+allrights:
+  - Copyright (c) Jon Schlinkert.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-008.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-008.txt.yml
index 7015ff97c3..bd08473258 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-008.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-008.txt.yml
@@ -3,6 +3,8 @@ what:
   - holders
   - authors
 copyrights:
-  - Copyright 2011 craigslist, inc
+  - Copyright 2011 craigslist, inc.
 holders:
-  - craigslist, inc
+  - craigslist, inc.
+allrights:
+  - Copyright 2011 craigslist, inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-012.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-012.txt.yml
index aba77d229b..eeb37d34bb 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-012.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-012.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2011, Joyent, Inc.
 holders:
   - Joyent, Inc.
+allrights:
+  - Copyright (c) 2011, Joyent, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-013.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-013.txt.yml
index f88471382f..7a088ae899 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-013.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-013.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2011, Robert Mustacchi
 holders:
   - Robert Mustacchi
+allrights:
+  - Copyright (c) 2011, Robert Mustacchi. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-017.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-017.txt.yml
index 233338ecf2..41fd82f518 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-017.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-017.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2009-2013, Jeff Mott
 holders:
   - Jeff Mott
+allrights:
+  - Copyright (c) 2009-2013, Jeff Mott. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-020.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-020.txt.yml
index 93cb5933d7..11840b88cd 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-020.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-020.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2012, Mark Cavage
 holders:
   - Mark Cavage
+allrights:
+  - Copyright (c) 2012, Mark Cavage. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-022.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-022.txt.yml
index 63608e72ab..c85c1aa381 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-022.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-022.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright 2011 Joyent, Inc.
 holders:
   - Joyent, Inc.
+allrights:
+  - Copyright 2011 Joyent, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-023.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-023.txt.yml
index 1077bcc6cf..8f8e518527 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-023.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-023.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright 2011 Mark Cavage <mcavage@gmail.com>
 holders:
   - Mark Cavage
+allrights:
+  - Copyright 2011 Mark Cavage <mcavage@gmail.com> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-024.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-024.txt.yml
index 1549c2deb2..1f4a5a4291 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-024.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-024.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright 2012 Joyent, Inc.
 holders:
   - Joyent, Inc.
+allrights:
+  - Copyright 2012 Joyent, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-028.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-028.txt.yml
index 0d3ba9fb36..846c505067 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-028.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-028.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2012-2014 Jon Schlinkert
 holders:
   - Jon Schlinkert
+allrights:
+  - Copyright (c) 2012-2014 Jon Schlinkert.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-031.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-031.txt.yml
index ab23b65643..8384eec83c 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-031.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-031.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2014 Jon Schlinkert
 holders:
   - Jon Schlinkert
+allrights:
+  - Copyright (c) 2014 Jon Schlinkert.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-041.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-041.txt.yml
index 76a7231bca..e77ed740fb 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-041.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-041.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2011, The Dojo Foundation
 holders:
   - The Dojo Foundation
+allrights:
+  - Copyright (c) 2011, The Dojo Foundation All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-042.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-042.txt.yml
index 0163462edc..4bfb95bf72 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-042.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-042.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - copyright 2011 Kevin Kwok (antimatter15@gmail.com)
 holders:
   - Kevin Kwok
+allrights:
+  - copyright 2011 Kevin Kwok (antimatter15@gmail.com).
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-043.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-043.txt.yml
index a2a18d2fdd..f8507523cd 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-043.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-043.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - copyright 2011 antimatter15 (antimatter15@gmail.com)
 holders:
   - antimatter15
+allrights:
+  - copyright 2011 antimatter15 (antimatter15@gmail.com).
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-044.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-044.txt.yml
index c9eba27440..b50d3cc520 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-044.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-044.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - copyright 2012 Eli Skeggs
 holders:
   - Eli Skeggs
+allrights:
+  - copyright 2012 Eli Skeggs.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-046.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-046.txt.yml
index 67d5efe15f..b4b964519a 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-046.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-046.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright c 2011 by Kimberly Geswein
 holders:
   - Kimberly Geswein
+allrights:
+  - Copyright c 2011 by Kimberly Geswein All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-103.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-103.txt.yml
index 47f606b4fe..dd15e9cf1f 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-103.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-103.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2011-2013, Christopher Jeffrey
 holders:
   - Christopher Jeffrey
+allrights:
+  - Copyright (c) 2011-2013, Christopher Jeffrey.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-104.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-104.txt.yml
index 47f606b4fe..dd15e9cf1f 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-104.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-104.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2011-2013, Christopher Jeffrey
 holders:
   - Christopher Jeffrey
+allrights:
+  - Copyright (c) 2011-2013, Christopher Jeffrey.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-114.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-114.txt.yml
index b1d5e92cb9..d3021d2b3c 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-114.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-114.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2012 Tyler Kellen
 holders:
   - Tyler Kellen
+allrights:
+  - Copyright (c) 2012 Tyler Kellen.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-115.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-115.txt.yml
index 0fd9bb41f3..b277bc88e4 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-115.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-115.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2012 Vitaly Puzrin (https://github.com/puzrin)
 holders:
   - Vitaly Puzrin
+allrights:
+  - Copyright (c) 2012 Vitaly Puzrin (https://github.com/puzrin).
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-127.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-127.txt.yml
index 078e710b96..1c505e3949 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-127.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-127.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2013 Jon Schlinkert, contributors
 holders:
   - Jon Schlinkert, contributors
+allrights:
+  - Copyright (c) 2013 Jon Schlinkert, contributors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-135.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-135.txt.yml
index a554cdabc6..58791f4c4f 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-135.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-135.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2013 Upstage
 holders:
   - Upstage
+allrights:
+  - Copyright (c) 2013 Upstage.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-145.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-145.txt.yml
index 1c4d1c4df7..1dc15dbc2b 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-145.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-145.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2013, Jon Schlinkert
 holders:
   - Jon Schlinkert
+allrights:
+  - Copyright (c) 2013, Jon Schlinkert.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-148.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-148.txt.yml
index 4ef658162c..1738ef004c 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-148.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-148.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2014 Assemble, contributors
 holders:
   - Assemble, contributors
+allrights:
+  - Copyright (c) 2014 Assemble, contributors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-150.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-150.txt.yml
index 3704508167..e1fa77e3e3 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-150.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-150.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2014 Brian Woodward, Jon Schlinkert, contributors
 holders:
   - Brian Woodward, Jon Schlinkert, contributors
+allrights:
+  - Copyright (c) 2014 Brian Woodward, Jon Schlinkert, contributors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-151.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-151.txt.yml
index 42fb8bfee3..de2ee8a91b 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-151.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-151.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2014 Brian Woodward, contributors
 holders:
   - Brian Woodward, contributors
+allrights:
+  - Copyright (c) 2014 Brian Woodward, contributors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-159.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-159.txt.yml
index 385a69f903..cb4a232c31 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-159.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-159.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2014 Jon Schlinkert, Brian Woodward, contributors
 holders:
   - Jon Schlinkert, Brian Woodward, contributors
+allrights:
+  - Copyright (c) 2014 Jon Schlinkert, Brian Woodward, contributors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-160.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-160.txt.yml
index 6d0af0cdcd..6a34433b90 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-160.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-160.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2014 Jon Schlinkert, Brian Woodward
 holders:
   - Jon Schlinkert, Brian Woodward
+allrights:
+  - Copyright (c) 2014 Jon Schlinkert, Brian Woodward.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-162.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-162.txt.yml
index 1d6a1251f8..ef9d0547af 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-162.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-162.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2014 Jon Schlinkert, contributors
 holders:
   - Jon Schlinkert, contributors
+allrights:
+  - Copyright (c) 2014 Jon Schlinkert, contributors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-170.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-170.txt.yml
index ea395aef6a..dbfd399b6f 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-170.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-170.txt.yml
@@ -7,3 +7,5 @@ copyrights:
     contributors
 holders:
   - Jon Schlinkert Brian Woodward contributors
+allrights:
+  - Copyright (c) 2014 Jon Schlinkert (http://twitter.com/jonschlinkert), Brian Woodward (http://twitter.com/doowb), contributors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-175.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-175.txt.yml
index 2900727528..0a92a55c73 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-175.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-175.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2014, Jon Schlinkert, Brian Woodward, contributors
 holders:
   - Jon Schlinkert, Brian Woodward, contributors
+allrights:
+  - Copyright (c) 2014, Jon Schlinkert, Brian Woodward, contributors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-177.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-177.txt.yml
index f6c79eeabd..cc55aa49ec 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-177.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-177.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2014, Jon Schlinkert, contributors
 holders:
   - Jon Schlinkert, contributors
+allrights:
+  - Copyright (c) 2014, Jon Schlinkert, contributors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-178.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-178.txt.yml
index 9efab71393..a05a803b9e 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-178.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-178.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2014-2015 Jon Schlinkert, contributors
 holders:
   - Jon Schlinkert, contributors
+allrights:
+  - Copyright (c) 2014-2015 Jon Schlinkert, contributors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-179.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-179.txt.yml
index 5ac9d7a0a9..fe15320173 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-179.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-179.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2015 Jon Schlinkert, contributors
 holders:
   - Jon Schlinkert, contributors
+allrights:
+  - Copyright (c) 2015 Jon Schlinkert, contributors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-185.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-185.txt.yml
index 34fabe8d96..658d365d38 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-185.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-185.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright 2010, 2011, Chris Winberry <chris@winberry.net>
 holders:
   - Chris Winberry
+allrights:
+  - Copyright 2010, 2011, Chris Winberry <chris@winberry.net> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-186.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-186.txt.yml
index 59a6452cb1..59aa373271 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-186.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-186.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright 2010, Chris Winberry <chris@winberry.net>
 holders:
   - Chris Winberry
+allrights:
+  - Copyright 2010, Chris Winberry <chris@winberry.net> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-190.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-190.txt.yml
index f3e0e37ae8..5e50e8f00f 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-190.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-190.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright 2011 The Closure Compiler Authors
 holders:
   - The Closure Compiler Authors
+allrights:
+  - Copyright 2011 The Closure Compiler Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-197.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-197.txt.yml
index 856fb60334..bb05a2451a 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-197.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-197.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright 2012- GoInstant, Inc. and other contributors
 holders:
   - GoInstant, Inc. and other contributors
+allrights:
+  - Copyright 2012- GoInstant, Inc. and other contributors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-212.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-212.txt.yml
index 8fbd127b35..45a8ee15ef 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-212.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-212.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2014 Caolan McMahon (https://github.com/caolan), contributors
 holders:
   - Caolan McMahon contributors
+allrights:
+  - Copyright (c) 2014 Caolan McMahon (https://github.com/caolan), contributors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-220.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-220.txt.yml
index 0aaf9e3c0c..ea0a42b1f2 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-220.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-220.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - copyright 2011 Kevin van Zonneveld
 holders:
   - Kevin van Zonneveld
+allrights:
+  - copyright 2011 Kevin van Zonneveld.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-222.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-222.txt.yml
index a10d2ceda6..2dd3c562ac 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-222.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-222.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - copyright (c) 2012 openmason
 holders:
   - openmason
+allrights:
+  - copyright (c) 2012 openmason.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-225.txt.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-225.txt.yml
index 31153baff0..0aa035d832 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-225.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq-225.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2013-2015, Jon Schlinkert
 holders:
   - Jon Schlinkert
+allrights:
+  - Copyright (c) 2013-2015, Jon Schlinkert.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq.ABOUT.yml b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq.ABOUT.yml
index a8f6689155..fa6a4f4dee 100644
--- a/tests/cluecode/data/copyrights/misco2/regexhq/regexhq.ABOUT.yml
+++ b/tests/cluecode/data/copyrights/misco2/regexhq/regexhq.ABOUT.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2015 Jon Schlinkert
 holders:
   - Jon Schlinkert
+allrights:
+  - Copyright (c) 2015 Jon Schlinkert.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/the-asf.txt.yml b/tests/cluecode/data/copyrights/misco2/the-asf.txt.yml
index e81e833f7d..cb51ffb603 100644
--- a/tests/cluecode/data/copyrights/misco2/the-asf.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/the-asf.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Apache Software Foundation
     count: 1
+allrights:
+  - Copyright 2001-2008 The Apache Software Foundation.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/w3c-ercim.txt.yml b/tests/cluecode/data/copyrights/misco2/w3c-ercim.txt.yml
index 0343db4d0d..c67c2a9ba1 100644
--- a/tests/cluecode/data/copyrights/misco2/w3c-ercim.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/w3c-ercim.txt.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: W3C(r) (MIT, ERCIM, Keio, Beihang)
     count: 1
+allrights:
+  - Copyright (c) YEAR W3C(r) (MIT, ERCIM, Keio, Beihang).
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco2/w3c_complex.txt.yml b/tests/cluecode/data/copyrights/misco2/w3c_complex.txt.yml
index cb0fc69da2..12c7f6ab4d 100644
--- a/tests/cluecode/data/copyrights/misco2/w3c_complex.txt.yml
+++ b/tests/cluecode/data/copyrights/misco2/w3c_complex.txt.yml
@@ -13,3 +13,5 @@ holders_summary:
   - value: W3C (R) (Massachusetts_Institute_of_Technology, Institut National_de_Recherche_en_Informatique_et_en_Automatique,
       Keio_University)
     count: 1
+allrights:
+  - Copyright (c) 1994-2002 W3C (R) (Massachusetts_Institute_of_Technology, Institut National_de_Recherche_en_Informatique_et_en_Automatique, Keio_University), All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco3/apache-foundation.txt.yml b/tests/cluecode/data/copyrights/misco3/apache-foundation.txt.yml
index 45f36e38d6..97ab352c63 100644
--- a/tests/cluecode/data/copyrights/misco3/apache-foundation.txt.yml
+++ b/tests/cluecode/data/copyrights/misco3/apache-foundation.txt.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: The Apache Software Foundation
     count: 1
+allrights:
+  - Copyright 2009 The Apache Software Foundation.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco3/distributed-copyright.txt.yml b/tests/cluecode/data/copyrights/misco3/distributed-copyright.txt.yml
index c2df105837..aff50ab205 100644
--- a/tests/cluecode/data/copyrights/misco3/distributed-copyright.txt.yml
+++ b/tests/cluecode/data/copyrights/misco3/distributed-copyright.txt.yml
@@ -14,3 +14,6 @@ holders_summary:
     count: 1
   - value: GSyC/LibreSoft, Universidad Rey Juan Carlos
     count: 1
+allrights:
+  - Copyright (c) 2010 GSyC/LibreSoft, Universidad Rey Juan Carlos.
+  - Copyright (c) Distributed Management Task Force
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco3/intractable-copyright-in-LICENSE.txt.yml b/tests/cluecode/data/copyrights/misco3/intractable-copyright-in-LICENSE.txt.yml
index 5b909aed30..a6f1d2aeef 100644
--- a/tests/cluecode/data/copyrights/misco3/intractable-copyright-in-LICENSE.txt.yml
+++ b/tests/cluecode/data/copyrights/misco3/intractable-copyright-in-LICENSE.txt.yml
@@ -16,3 +16,6 @@ holders_summary:
     count: 1
   - value: Formidable Labs
     count: 1
+allrights:
+  - Copyright (c) 2015-2020 Formidable Labs.
+  - Copyright (c) 2016-2020 Alexey Svetliakov https://github.com/asvetliakov , snerks https://github.com/snerks, Krzysztof Cebula https://github.com Havret, Vitaliy Polyanskiy https://github.com/alreadyExisted, James Lismore https://github.com/jlismore
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco3/intractable-copyright-in-LICENSE2.txt.yml b/tests/cluecode/data/copyrights/misco3/intractable-copyright-in-LICENSE2.txt.yml
index f2f52d3c23..2c85d03180 100644
--- a/tests/cluecode/data/copyrights/misco3/intractable-copyright-in-LICENSE2.txt.yml
+++ b/tests/cluecode/data/copyrights/misco3/intractable-copyright-in-LICENSE2.txt.yml
@@ -16,3 +16,6 @@ holders_summary:
     count: 1
   - value: Formidable Labs
     count: 1
+allrights:
+  - Copyright (c) 2015-2020 Formidable Labs.
+  - Copyright (c) 2016-2020 Alexey Svetliakov https://github.com/asvetliakov , snerks https://github.com/snerks, Krzysztof Cebula https://github.com/Havret , Vitaliy Polyanskiy https://github.com/alreadyExisted, James Lismore https://github.com/jlismore
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco3/parens-with-spaces.txt.yml b/tests/cluecode/data/copyrights/misco3/parens-with-spaces.txt.yml
index edbba5e714..7ba4a35894 100644
--- a/tests/cluecode/data/copyrights/misco3/parens-with-spaces.txt.yml
+++ b/tests/cluecode/data/copyrights/misco3/parens-with-spaces.txt.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: 3Dfx Interactive, Inc.
     count: 1
+allrights:
+  - Copyright (1997 3Dfx Interactive, Inc.) All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/as-represented.txt.yml b/tests/cluecode/data/copyrights/misco4/as-represented.txt.yml
index ac916d9803..320142f575 100644
--- a/tests/cluecode/data/copyrights/misco4/as-represented.txt.yml
+++ b/tests/cluecode/data/copyrights/misco4/as-represented.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2000 United States Government as represented by the Secretary of the Navy
 holders:
   - United States Government as represented by the Secretary of the Navy
+allrights:
+  - Copyright (c) 2000 United States Government as represented by the Secretary of the Navy. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/initial-dev-again.txt.yml b/tests/cluecode/data/copyrights/misco4/initial-dev-again.txt.yml
index 7ffcfac794..7581c1825a 100644
--- a/tests/cluecode/data/copyrights/misco4/initial-dev-again.txt.yml
+++ b/tests/cluecode/data/copyrights/misco4/initial-dev-again.txt.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: the Initial Developer
     count: 1
+allrights:
+  - Portions created by the Initial Developer are Copyright (c) 2005 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/Documentation/networking/arcnet-hardware.txt.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/Documentation/networking/arcnet-hardware.txt.yml
index a6980ce212..6899ead7e5 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/Documentation/networking/arcnet-hardware.txt.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/Documentation/networking/arcnet-hardware.txt.yml
@@ -20,4 +20,6 @@ authors:
 expected_failures:
   - copyrights
   - holders
-  - authors
\ No newline at end of file
+  - authorsallrights:
+  - (c) 1985 Waterloo Micro.
+  - (c) 1985
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/Documentation/s390/Debugging390.txt.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/Documentation/s390/Debugging390.txt.yml
index 13751f0fe3..3fb614a0c8 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/Documentation/s390/Debugging390.txt.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/Documentation/s390/Debugging390.txt.yml
@@ -12,3 +12,7 @@ holders:
   - Free Software Foundation, Inc.
 authors:
   - Denis Joseph Barrow
+allrights:
+  - Copyright (c) 2000-2001 IBM Deutschland Entwicklung GmbH, IBM Corporation Best
+  - (c) 2000 IBM Deutschland Entwicklung GmbH, IBM Corporation.
+  - Copyright 1998 Free Software Foundation, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/arm/kernel/sys_arm.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/arm/kernel/sys_arm.c.yml
index e4d0fb2a6d..a05a054e01 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/arm/kernel/sys_arm.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/arm/kernel/sys_arm.c.yml
@@ -8,3 +8,6 @@ copyrights:
 holders:
   - People
   - Russell King
+allrights:
+  - Copyright (c) People
+  - Copyright (c) 1995, 1996 Russell King.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/arm/mach-imx/mach-bug.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/arm/mach-imx/mach-bug.c.yml
index 9968037435..7c2a528e5a 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/arm/mach-imx/mach-bug.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/arm/mach-imx/mach-bug.c.yml
@@ -12,3 +12,8 @@ holders:
   - Shane Nay
   - Freescale Semiconductor, Inc.
   - Denis GNUtoo Carikli
+allrights:
+  - Copyright (c) 2000 Deep Blue Solutions Ltd
+  - Copyright (c) 2002 Shane Nay (shane@minirl.com)
+  - Copyright 2005-2007 Freescale Semiconductor, Inc. All Rights Reserved.
+  - Copyright 2011 Denis GNUtoo Carikli <GNUtoo@no-log.org>
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/arm/mach-tegra/platsmp.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/arm/mach-tegra/platsmp.c.yml
index bbbab2d589..d2c83737e5 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/arm/mach-tegra/platsmp.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/arm/mach-tegra/platsmp.c.yml
@@ -8,3 +8,6 @@ copyrights:
 holders:
   - ARM Ltd.
   - Palm
+allrights:
+  - Copyright (c) 2002 ARM Ltd. All Rights Reserved
+  - Copyright (c) 2009 Palm All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/arm64/kernel/sys_compat.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/arm64/kernel/sys_compat.c.yml
index 703697e6f0..96b82cd6a6 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/arm64/kernel/sys_compat.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/arm64/kernel/sys_compat.c.yml
@@ -10,3 +10,7 @@ holders:
   - People
   - Russell King
   - ARM Ltd.
+allrights:
+  - Copyright (c) People
+  - Copyright (c) 1995, 1996 Russell King.
+  - Copyright (c) 2012 ARM Ltd.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/microblaze/lib/fastcopy.S.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/microblaze/lib/fastcopy.S.yml
index 1e32ec4ac7..9793c70587 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/microblaze/lib/fastcopy.S.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/microblaze/lib/fastcopy.S.yml
@@ -10,3 +10,7 @@ holders:
   - Michal Simek
   - PetaLogix
   - Jim Law - Iris LP
+allrights:
+  - Copyright (c) 2008-2009 Michal Simek <monstr@monstr.eu>
+  - Copyright (c) 2008-2009 PetaLogix
+  - Copyright (c) 2008 Jim Law - Iris LP All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/powerpc/platforms/cell/spufs/Makefile.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/powerpc/platforms/cell/spufs/Makefile.yml
index 78a2818064..4a4c480efa 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/powerpc/platforms/cell/spufs/Makefile.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/powerpc/platforms/cell/spufs/Makefile.yml
@@ -3,6 +3,8 @@ what:
   - holders
   - authors
 copyrights:
-  - Copyright (c) 2005 IBM echo Hex-dump
+  - Copyright (c) 2005 IBM. echo Hex-dump
 holders:
-  - IBM echo Hex-dump
+  - IBM. echo Hex-dump
+allrights:
+  - Copyright (c) 2005 IBM. echo Hex-dump
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/um/drivers/daemon_kern.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/um/drivers/daemon_kern.c.yml
index cfe9f6f239..1a4e062650 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/um/drivers/daemon_kern.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/um/drivers/daemon_kern.c.yml
@@ -10,3 +10,7 @@ holders:
   - Lennert Buytenhek and James Leu
   - Jeff Dike
   - various
+allrights:
+  - Copyright (c) 2001 Lennert Buytenhek (buytenh@gnu.org) and James Leu (jleu@mindspring.net).
+  - Copyright (c) 2001 - 2007 Jeff Dike
+  - Copyright (c) 2001 by various
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/um/drivers/daemon_user.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/um/drivers/daemon_user.c.yml
index 6fde9d70c9..ec2f31fa4d 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/um/drivers/daemon_user.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/um/drivers/daemon_user.c.yml
@@ -10,3 +10,7 @@ holders:
   - Jeff Dike
   - Lennert Buytenhek and James Leu
   - various
+allrights:
+  - Copyright (c) 2001 - 2007 Jeff Dike
+  - Copyright (c) 2001 Lennert Buytenhek (buytenh@gnu.org) and James Leu (jleu@mindspring.net).
+  - Copyright (c) 2001 by various
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/um/drivers/net_kern.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/um/drivers/net_kern.c.yml
index 6fde9d70c9..ec2f31fa4d 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/um/drivers/net_kern.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/um/drivers/net_kern.c.yml
@@ -10,3 +10,7 @@ holders:
   - Jeff Dike
   - Lennert Buytenhek and James Leu
   - various
+allrights:
+  - Copyright (c) 2001 - 2007 Jeff Dike
+  - Copyright (c) 2001 Lennert Buytenhek (buytenh@gnu.org) and James Leu (jleu@mindspring.net).
+  - Copyright (c) 2001 by various
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/um/drivers/umcast_kern.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/um/drivers/umcast_kern.c.yml
index 34996bd828..f33560ffbe 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/um/drivers/umcast_kern.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/arch/um/drivers/umcast_kern.c.yml
@@ -12,3 +12,8 @@ holders:
   - Jeff Dike
   - Lennert Buytenhek and James Leu
   - various
+allrights:
+  - Copyright (c) 2001 by Harald Welte <laforge@gnumonks.org>
+  - Copyright (c) 2001 - 2007 Jeff Dike
+  - Copyright (c) 2001 Lennert Buytenhek (buytenh@gnu.org) and James Leu (jleu@mindspring.net).
+  - Copyright (c) 2001 by various
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/ata/sata_mv.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/ata/sata_mv.c.yml
index ea166d615a..185849531e 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/ata/sata_mv.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/ata/sata_mv.c.yml
@@ -13,3 +13,7 @@ holders:
 authors:
   - Brett Russ. Extensive
   - Mark Lord <mlord@pobox.com>
+allrights:
+  - Copyright 2008-2009 Marvell Corporation, all rights reserved.
+  - Copyright 2005 EMC Corporation, all rights reserved.
+  - Copyright 2005 Red Hat, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/gpu/drm/drm_agpsupport.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/gpu/drm/drm_agpsupport.c.yml
index d23fd8add5..52bd80c9a4 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/gpu/drm/drm_agpsupport.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/gpu/drm/drm_agpsupport.c.yml
@@ -11,3 +11,6 @@ holders:
 authors:
   - Rickard E.
   - Gareth Hughes <gareth@valinux.com>
+allrights:
+  - Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+  - Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/hid/hid-appleir.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/hid/hid-appleir.c.yml
index cbc8cbd11d..3a8246c280 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/hid/hid-appleir.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/hid/hid-appleir.c.yml
@@ -21,3 +21,10 @@ authors:
   - Greg Kroah-Hartman <gregkh@suse.de>
   - Bastien Nocera <hadess@hadess.net>
   - Benjamin Tissoires <benjamin.tissoires@gmail.com>
+allrights:
+  - Copyright (c) 2006 James McKenzie
+  - Copyright (c) 2008 Greg Kroah-Hartman <greg@kroah.com>
+  - Copyright (c) 2008 Novell Inc.
+  - Copyright (c) 2010, 2012 Bastien Nocera <hadess@hadess.net>
+  - Copyright (c) 2013 Benjamin Tissoires <benjamin.tissoires@gmail.com>
+  - Copyright (c) 2013 Red Hat Inc. All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_bridge.h.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_bridge.h.yml
index 7ea2f1f11f..90d014770d 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_bridge.h.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_bridge.h.yml
@@ -12,3 +12,8 @@ holders:
   - Ilyes Gouta
   - m5603x
   - Willem Duinker
+allrights:
+  - Copyright (c) 2008 Erik Andren
+  - Copyright (c) 2007 Ilyes Gouta.
+  - Copyright (c) 2005 m5603x
+  - Copyright (c) 2006 Willem Duinker
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_core.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_core.c.yml
index 7ea2f1f11f..90d014770d 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_core.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_core.c.yml
@@ -12,3 +12,8 @@ holders:
   - Ilyes Gouta
   - m5603x
   - Willem Duinker
+allrights:
+  - Copyright (c) 2008 Erik Andren
+  - Copyright (c) 2007 Ilyes Gouta.
+  - Copyright (c) 2005 m5603x
+  - Copyright (c) 2006 Willem Duinker
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_mt9m111.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_mt9m111.c.yml
index 7ea2f1f11f..90d014770d 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_mt9m111.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_mt9m111.c.yml
@@ -12,3 +12,8 @@ holders:
   - Ilyes Gouta
   - m5603x
   - Willem Duinker
+allrights:
+  - Copyright (c) 2008 Erik Andren
+  - Copyright (c) 2007 Ilyes Gouta.
+  - Copyright (c) 2005 m5603x
+  - Copyright (c) 2006 Willem Duinker
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_mt9m111.h.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_mt9m111.h.yml
index 7b5f5f1257..85488ec140 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_mt9m111.h.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_mt9m111.h.yml
@@ -14,3 +14,9 @@ holders:
   - m5603x
   - Willem Duinker
   - Robert Jarzmik
+allrights:
+  - Copyright (c) 2008 Erik Andren
+  - Copyright (c) 2007 Ilyes Gouta.
+  - Copyright (c) 2005 m5603x
+  - Copyright (c) 2006 Willem Duinker
+  - Copyright (c) 2008, Robert Jarzmik <robert.jarzmik@free.fr>
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_ov7660.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_ov7660.c.yml
index ea0ce1b65a..6a30d8c367 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_ov7660.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_ov7660.c.yml
@@ -12,3 +12,8 @@ holders:
   - Ilyes Gouta
   - m5603x
   - Willem Duinker
+allrights:
+  - Copyright (c) 2009 Erik Andren
+  - Copyright (c) 2007 Ilyes Gouta.
+  - Copyright (c) 2005 m5603x
+  - Copyright (c) 2006 Willem Duinker
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_s5k83a.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_s5k83a.c.yml
index 7ea2f1f11f..90d014770d 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_s5k83a.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_s5k83a.c.yml
@@ -12,3 +12,8 @@ holders:
   - Ilyes Gouta
   - m5603x
   - Willem Duinker
+allrights:
+  - Copyright (c) 2008 Erik Andren
+  - Copyright (c) 2007 Ilyes Gouta.
+  - Copyright (c) 2005 m5603x
+  - Copyright (c) 2006 Willem Duinker
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_s5k83a.h.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_s5k83a.h.yml
index 7ea2f1f11f..90d014770d 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_s5k83a.h.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_s5k83a.h.yml
@@ -12,3 +12,8 @@ holders:
   - Ilyes Gouta
   - m5603x
   - Willem Duinker
+allrights:
+  - Copyright (c) 2008 Erik Andren
+  - Copyright (c) 2007 Ilyes Gouta.
+  - Copyright (c) 2005 m5603x
+  - Copyright (c) 2006 Willem Duinker
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_sensor.h.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_sensor.h.yml
index 7ea2f1f11f..90d014770d 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_sensor.h.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/media/usb/gspca/m5602/m5602_sensor.h.yml
@@ -12,3 +12,8 @@ holders:
   - Ilyes Gouta
   - m5603x
   - Willem Duinker
+allrights:
+  - Copyright (c) 2008 Erik Andren
+  - Copyright (c) 2007 Ilyes Gouta.
+  - Copyright (c) 2005 m5603x
+  - Copyright (c) 2006 Willem Duinker
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/misc/mei/hw-txe-regs.h.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/misc/mei/hw-txe-regs.h.yml
index b3d2410114..fb99a50d5c 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/misc/mei/hw-txe-regs.h.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/misc/mei/hw-txe-regs.h.yml
@@ -10,3 +10,6 @@ holders:
   - Intel Corporation
 authors:
   - the Host
+allrights:
+  - Copyright (c) 2013 - 2014 Intel Corporation. All rights reserved.
+  - Copyright (c) 2013 - 2014 Intel Corporation. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/net/can/sja1000/sja1000.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/net/can/sja1000/sja1000.c.yml
index a51786efe8..7d4d8e6653 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/net/can/sja1000/sja1000.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/net/can/sja1000/sja1000.c.yml
@@ -8,3 +8,6 @@ copyrights:
 holders:
   - Matthias Brukner, Trajet Gmbh, Rebenring
   - Volkswagen Group Electronic Research
+allrights:
+  - Copyright (c) 2003 Matthias Brukner, Trajet Gmbh, Rebenring
+  - Copyright (c) 2002-2007 Volkswagen Group Electronic Research All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/net/can/sja1000/sja1000.h.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/net/can/sja1000/sja1000.h.yml
index a51786efe8..7d4d8e6653 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/net/can/sja1000/sja1000.h.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/net/can/sja1000/sja1000.h.yml
@@ -8,3 +8,6 @@ copyrights:
 holders:
   - Matthias Brukner, Trajet Gmbh, Rebenring
   - Volkswagen Group Electronic Research
+allrights:
+  - Copyright (c) 2003 Matthias Brukner, Trajet Gmbh, Rebenring
+  - Copyright (c) 2002-2007 Volkswagen Group Electronic Research All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/net/ethernet/broadcom/tg3.h.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/net/ethernet/broadcom/tg3.h.yml
index 58648944a1..9fe4384459 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/net/ethernet/broadcom/tg3.h.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/net/ethernet/broadcom/tg3.h.yml
@@ -25,3 +25,10 @@ authors:
   - Transmit MAC.
   - Receive List Placement
   - Host Coalescing
+allrights:
+  - Copyright (c) 2001, 2002, 2003, 2004 David S. Miller (davem@redhat.com)
+  - Copyright (c) 2001 Jeff Garzik (jgarzik@pobox.com)
+  - Copyright (c) 2004 Sun Microsystems Inc.
+  - Copyright (c) 2007-2016 Broadcom Corporation.
+  - Copyright (c) 2016-2017 Broadcom Limited.
+  - Copyright (c) 2018 Broadcom. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/net/ethernet/dec/tulip/de4x5.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/net/ethernet/dec/tulip/de4x5.c.yml
index 82aeac4bb9..83a50160c9 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/net/ethernet/dec/tulip/de4x5.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/net/ethernet/dec/tulip/de4x5.c.yml
@@ -30,3 +30,5 @@ authors:
   - <mmporter@home.com>
   - <geert@linux-m68k.org>
   - <Matt_Domsch@dell.com>
+allrights:
+  - Copyright 1994, 1995 Digital Equipment Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/net/wireless/intel/ipw2x00/ipw2200.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/net/wireless/intel/ipw2x00/ipw2200.c.yml
index a401fc8423..c48700b2fa 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/net/wireless/intel/ipw2x00/ipw2200.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/net/wireless/intel/ipw2x00/ipw2200.c.yml
@@ -12,3 +12,8 @@ holders:
   - Axis Communications AB Ethereal
   - Gerald Combs
   - Intel Corporation
+allrights:
+  - Copyright (c) 2003 - 2006 Intel Corporation. All rights reserved.
+  - Copyright 2000, Axis Communications AB Ethereal
+  - Copyright 1998 Gerald Combs
+  - Copyright (c) 2003-2006 Intel Corporation
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/scsi/scsi_transport_fc.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/scsi/scsi_transport_fc.c.yml
index 40c633300a..79030fcf84 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/scsi/scsi_transport_fc.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/scsi/scsi_transport_fc.c.yml
@@ -10,3 +10,6 @@ holders:
   - James Smart, Emulex Corporation Rewrite
 authors:
   - Martin Hicks
+allrights:
+  - Copyright (c) 2003 Silicon Graphics, Inc. All rights reserved.
+  - Copyright (c) 2004-2007 James Smart, Emulex Corporation Rewrite
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtl8723bs/hal/sdio_ops.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtl8723bs/hal/sdio_ops.c.yml
index 2f4970266a..7abae42697 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtl8723bs/hal/sdio_ops.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtl8723bs/hal/sdio_ops.c.yml
@@ -8,3 +8,5 @@ holders:
   - Realtek Corporation
 authors:
   - Roger
+allrights:
+  - Copyright (c) 2007 - 2012 Realtek Corporation. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_sdio.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_sdio.c.yml
index 24c22fbae0..bf63ca54de 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_sdio.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_sdio.c.yml
@@ -10,3 +10,5 @@ authors:
   - KaiYuan Chang/Ivan Lin Return
   - KaiYuan Chang Return
   - Ivan Return
+allrights:
+  - Copyright (c) 2016 Realtek Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_usb.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_usb.c.yml
index 0001503be5..322d67f54d 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_usb.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_usb.c.yml
@@ -10,3 +10,5 @@ authors:
   - KaiYuan Chang Return
   - KaiYuan Chang Return
   - Ivan Return
+allrights:
+  - Copyright (c) 2016 Realtek Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.c.yml
index aef7df5ca4..62ebee63e2 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.c.yml
@@ -69,3 +69,5 @@ authors:
   - KaiYuan Chang Return
   - chunchu Return
   - Ivan Lin Return
+allrights:
+  - Copyright (c) 2016 Realtek Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_pcie.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_pcie.c.yml
index e66041d27f..512db4a20e 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_pcie.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_pcie.c.yml
@@ -17,3 +17,5 @@ authors:
   - KaiYuan Chang/Ivan Lin Return
   - KaiYuan Chang/Ivan Lin Return
   - Soar Tu Return
+allrights:
+  - Copyright (c) 2016 Realtek Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.c.yml
index d5d16369a6..3f8ee6f9b6 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.c.yml
@@ -21,3 +21,5 @@ authors:
   - Soar Tu Return
   - Ivan Lin Return
   - Soar Return
+allrights:
+  - Copyright (c) 2016 Realtek Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/tty/n_tty.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/tty/n_tty.c.yml
index dd3f5b6c15..d98d04afea 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/tty/n_tty.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/tty/n_tty.c.yml
@@ -12,3 +12,7 @@ holders:
   - Reduced
 authors:
   - Andrew J. Kroll <ag784@freenet.buffalo.edu>
+allrights:
+  - Theodore Ts'o, Copyright 1994.
+  - Linus Torvalds, Copyright 1991, 1992, 1993
+  - Copyright 1994. Reduced
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/tty/nozomi.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/tty/nozomi.c.yml
index 0b8c0b71bb..c4e1fb2d9d 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/tty/nozomi.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/tty/nozomi.c.yml
@@ -12,3 +12,7 @@ holders:
   - Option Wireless n/v
 authors:
   - Paul Hardwick (p.hardwick@option.com)
+allrights:
+  - Copyright (c) 2005,2006 Option Wireless Sweden AB
+  - Copyright (c) 2006 Sphere Systems Ltd
+  - Copyright (c) 2006 Option Wireless n/v All rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/usb/gadget/legacy/gmidi.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/usb/gadget/legacy/gmidi.c.yml
index a7a0235169..d2110ea902 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/usb/gadget/legacy/gmidi.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/drivers/usb/gadget/legacy/gmidi.c.yml
@@ -14,3 +14,8 @@ holders:
   - Clemens Ladisch
 authors:
   - Grey Innovation Ben Williamson <ben.williamson@greyinnovation.com>
+allrights:
+  - Copyright (c) 2006 Thumtronics Pty Ltd.
+  - Copyright (c) 2003-2004 David Brownell. USB Audio
+  - Copyright (c) 2002 by Takashi Iwai. USB
+  - Copyright (c) 2002-2005 Clemens Ladisch.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/fs/nilfs2/sufile.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/fs/nilfs2/sufile.c.yml
index 89b5356dc0..a32a344ee2 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/fs/nilfs2/sufile.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/fs/nilfs2/sufile.c.yml
@@ -8,3 +8,5 @@ holders:
   - Nippon Telegraph and Telephone Corporation
 authors:
   - Koji Sato. Revised
+allrights:
+  - Copyright (c) 2006-2008 Nippon Telegraph and Telephone Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/include/acpi/actbl3.h.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/include/acpi/actbl3.h.yml
index 37f6e8c3b3..b4b56c98ee 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/include/acpi/actbl3.h.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/include/acpi/actbl3.h.yml
@@ -10,3 +10,7 @@ holders:
   - Intel Corp.
   - Microsoft
   - Microsoft Corporation
+allrights:
+  - Copyright (c) 2000 - 2018, Intel Corp.
+  - Copyright 2011 Microsoft
+  - Copyright 2006 Microsoft Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/include/linux/pnfs_osd_xdr.h.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/include/linux/pnfs_osd_xdr.h.yml
index 1ea4c4bfda..9882ad2110 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/include/linux/pnfs_osd_xdr.h.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/include/linux/pnfs_osd_xdr.h.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2007 Panasas Inc. year of first publication
 holders:
   - Panasas Inc. year of first publication
+allrights:
+  - Copyright (c) 2007 Panasas Inc. year of first publication All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/include/scsi/scsi_transport_fc.h.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/include/scsi/scsi_transport_fc.h.yml
index b01b84a3a2..61df434587 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/include/scsi/scsi_transport_fc.h.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/include/scsi/scsi_transport_fc.h.yml
@@ -8,3 +8,6 @@ copyrights:
 holders:
   - Silicon Graphics, Inc.
   - James Smart, Emulex Corporation Rewrite
+allrights:
+  - Copyright (c) 2003 Silicon Graphics, Inc. All rights reserved.
+  - Copyright (c) 2004-2007 James Smart, Emulex Corporation Rewrite
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/include/uapi/linux/mic_common.h.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/include/uapi/linux/mic_common.h.yml
index b19512d6d9..1e49b01e90 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/include/uapi/linux/mic_common.h.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/include/uapi/linux/mic_common.h.yml
@@ -8,3 +8,5 @@ holders:
   - Intel Corporation
 authors:
   - the Guest. @config Start
+allrights:
+  - Copyright (c) 2013 Intel Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/include/uapi/linux/nbd.h.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/include/uapi/linux/nbd.h.yml
index 4fd39790af..a96ea66690 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/include/uapi/linux/nbd.h.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/include/uapi/linux/nbd.h.yml
@@ -10,3 +10,7 @@ holders:
   - Pavel Machek
   - VMware, Inc. (Regis HPReg Duchesne) Made
   - Steven Whitehouse
+allrights:
+  - Copyright (c) Pavel Machek, pavel@ucw.cz.
+  - Copyright (c) 1999 VMware, Inc. (Regis HPReg Duchesne) Made
+  - Copyright (c) Steven Whitehouse
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/kernel/time/posix-timers.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/kernel/time/posix-timers.c.yml
index 2ca8d98c00..88ac2f8b7c 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/kernel/time/posix-timers.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/kernel/time/posix-timers.c.yml
@@ -10,3 +10,6 @@ holders:
   - Boris
 authors:
   - George Anzinger george@mvista.com
+allrights:
+  - Copyright (c) 2002 2003 by MontaVista Software.
+  - Copyright (c) 2004 Boris
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/scripts/coccinelle/api/pm_runtime.cocci.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/scripts/coccinelle/api/pm_runtime.cocci.yml
index 52f2576a99..4e326928b9 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/scripts/coccinelle/api/pm_runtime.cocci.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/scripts/coccinelle/api/pm_runtime.cocci.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2013 Texas Instruments Incorporated - GPLv2
 holders:
   - Texas Instruments Incorporated - GPLv2
+allrights:
+  - Copyright (c) 2013 Texas Instruments Incorporated - GPLv2.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/sound/ppc/snd_ps3_reg.h.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/sound/ppc/snd_ps3_reg.h.yml
index 9c596f2bd2..2726ac5acd 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/sound/ppc/snd_ps3_reg.h.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/sound/ppc/snd_ps3_reg.h.yml
@@ -10,3 +10,7 @@ holders:
   - Sony Computer Entertainment Inc.
   - Sony Corporation
   - R Value
+allrights:
+  - Copyright (c) 2007 Sony Computer Entertainment Inc.
+  - Copyright 2006, 2007 Sony Corporation All rights reserved.
+  - (c) R Value
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/sound/soc/codecs/nau8825.c.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/sound/soc/codecs/nau8825.c.yml
index 4e086044f3..e3ccf8a0e3 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/sound/soc/codecs/nau8825.c.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/sound/soc/codecs/nau8825.c.yml
@@ -10,3 +10,6 @@ holders:
   - Nuvoton Technology Corp. Co-author Meng-Huang Kuo
 authors:
   - Anatol Pomozov <anatol@chromium.org>
+allrights:
+  - Copyright 2015 Google Chromium project.
+  - Copyright 2015 Nuvoton Technology Corp. Co-author Meng-Huang Kuo <mhkuo@nuvoton.com>
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux-copyrights/tools/testing/selftests/ntb/ntb_test.sh.yml b/tests/cluecode/data/copyrights/misco4/linux-copyrights/tools/testing/selftests/ntb/ntb_test.sh.yml
index 7f57db9ee4..0d1e3b476f 100644
--- a/tests/cluecode/data/copyrights/misco4/linux-copyrights/tools/testing/selftests/ntb/ntb_test.sh.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux-copyrights/tools/testing/selftests/ntb/ntb_test.sh.yml
@@ -8,3 +8,5 @@ holders:
   - Microsemi
 authors:
   - Logan Gunthorpe <logang@deltatee.com>
+allrights:
+  - Copyright (c) 2016 Microsemi. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux/dynamic.txt.yml b/tests/cluecode/data/copyrights/misco4/linux/dynamic.txt.yml
index 400bc3a822..631202216d 100644
--- a/tests/cluecode/data/copyrights/misco4/linux/dynamic.txt.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux/dynamic.txt.yml
@@ -16,3 +16,10 @@ holders:
   - Dynamic Drive
   - Dynamic System Bars Project
   - Dynamic Solutions
+allrights:
+  - Copyright (c) Dynamic Network Services, Inc
+  - Copyright (c) frisB.com <play@frisb.com>
+  - Copyright (c) dynamic-evaluation, https://github.com/benkrause/dynamic-evaluation
+  - copyright (c) Dynamic Drive (www.dynamicdrive.com)
+  - Copyright (c) Dynamic System Bars Project
+  - Copyright (c) Dynamic Solutions. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux/irq.txt.yml b/tests/cluecode/data/copyrights/misco4/linux/irq.txt.yml
index 2a9169efd1..e92f477cab 100644
--- a/tests/cluecode/data/copyrights/misco4/linux/irq.txt.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux/irq.txt.yml
@@ -12,3 +12,7 @@ holders:
   - Nokia Corporation
 authors:
   - Tony Lindgren <tony@atomide.com> and Tuukka Tikkanen <tuukka.tikkanen@elektrobit.com>
+allrights:
+  - Copyright (c) 1992 Linus Torvalds
+  - Copyright (c) 1995-2000 Russell King.
+  - Copyright (c) 2004-2005 Nokia Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux4/multilines.txt.yml b/tests/cluecode/data/copyrights/misco4/linux4/multilines.txt.yml
index b5c3aa73c6..4f48220643 100644
--- a/tests/cluecode/data/copyrights/misco4/linux4/multilines.txt.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux4/multilines.txt.yml
@@ -8,3 +8,5 @@ holders:
   - the University of Cambridge, England
 authors:
   - Philip Hazel
+allrights:
+  - copyright by the University of Cambridge, England.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux4/nsa.txt.yml b/tests/cluecode/data/copyrights/misco4/linux4/nsa.txt.yml
index 9f86769f80..bf1c1c5012 100644
--- a/tests/cluecode/data/copyrights/misco4/linux4/nsa.txt.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux4/nsa.txt.yml
@@ -8,3 +8,6 @@ copyrights:
 holders:
   - Donald Becker
   - United States Government
+allrights:
+  - Copyright 1994-2000 by Donald Becker.
+  - Copyright 1993 United States Government
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux4/send.txt.yml b/tests/cluecode/data/copyrights/misco4/linux4/send.txt.yml
index 0064e5217d..9701443fbe 100644
--- a/tests/cluecode/data/copyrights/misco4/linux4/send.txt.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux4/send.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Gordon Chaffee Copyright (c) 1995
 holders:
   - Gordon Chaffee
+allrights:
+  - Gordon Chaffee Copyright (c) 1995.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/linux4/sgi.txt.yml b/tests/cluecode/data/copyrights/misco4/linux4/sgi.txt.yml
index f87624036f..36e87408e5 100644
--- a/tests/cluecode/data/copyrights/misco4/linux4/sgi.txt.yml
+++ b/tests/cluecode/data/copyrights/misco4/linux4/sgi.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) September 18, 2008 Silicon Graphics, Inc.
 holders:
   - September Silicon Graphics, Inc.
+allrights:
+  - Copyright (c) September 18, 2008 Silicon Graphics, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/more-linux/misc-linux.txt.yml b/tests/cluecode/data/copyrights/misco4/more-linux/misc-linux.txt.yml
index dcd528378c..2f55e5aa9e 100644
--- a/tests/cluecode/data/copyrights/misco4/more-linux/misc-linux.txt.yml
+++ b/tests/cluecode/data/copyrights/misco4/more-linux/misc-linux.txt.yml
@@ -47,3 +47,26 @@ holders:
   - Grant R. Guenther
   - Grant R. Guenther David Campbell
   - its respective authors
+allrights:
+  - Copyright (c) 2011 Instituto Nokia de Tecnologia
+  - Copyright (c) 2012-2013 Tieto Poland
+  - Copyright (c) 2016 HALE electronic
+  - Copyright (c) People
+  - Copyright (c) 2010 Alan Ott <alan@signal11.us>
+  - Copyright (c) 2010 Signal 11 Software
+  - Copyright (c) 2010, Octasic semiconductor.
+  - Copyright 2016 Tom aan de Wiel
+  - Copyright 2018 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
+  - (c) 2006 Tim Small
+  - (c) by the respective authors
+  - copyright by the original
+  - Copyright 1993 United States Government
+  - Copyright 2010 Ben Dooks ben-linux <at> fluff.org
+  - Copyright (c) 2010 Dmitry Torokhov
+  - (c) liplianin@me.by
+  - Ingo Molnar, Copyright (c) 2001
+  - David Rientjes, Copyright (c) 2015
+  - (c) 1985
+  - (c) 1996-8 Grant R. Guenther <grant@torque.net>
+  - (c) 1996 Grant R. Guenther grant@torque.net David Campbell
+  - copyright by its respective authors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/more-linux/octa.txt.yml b/tests/cluecode/data/copyrights/misco4/more-linux/octa.txt.yml
index 580987c026..f3f9c83940 100644
--- a/tests/cluecode/data/copyrights/misco4/more-linux/octa.txt.yml
+++ b/tests/cluecode/data/copyrights/misco4/more-linux/octa.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2010, Octasic semiconductor
 holders:
   - Octasic semiconductor
+allrights:
+  - Copyright (c) 2010, Octasic semiconductor.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/nasa-copyright.yml b/tests/cluecode/data/copyrights/misco4/nasa-copyright.yml
index 28109c8b81..6b2ddd7d2e 100644
--- a/tests/cluecode/data/copyrights/misco4/nasa-copyright.yml
+++ b/tests/cluecode/data/copyrights/misco4/nasa-copyright.yml
@@ -13,3 +13,5 @@ holders_summary:
   - value: United States Government as represented by the Administrator of the National Aeronautics
       and Space Administration
     count: 1
+allrights:
+  - Copyright (c) 2006-2010 United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/misco4/portions-initial-developer.txt.yml b/tests/cluecode/data/copyrights/misco4/portions-initial-developer.txt.yml
index 96c2c1fc58..a6c7e9559f 100644
--- a/tests/cluecode/data/copyrights/misco4/portions-initial-developer.txt.yml
+++ b/tests/cluecode/data/copyrights/misco4/portions-initial-developer.txt.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: the Initial Developer
     count: 1
+allrights:
+  - Portions created by the Initial Developer are Copyright (c) the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/mit_danse-mojibake.yml b/tests/cluecode/data/copyrights/mit_danse-mojibake.yml
index b93446faaf..2b73c7f889 100644
--- a/tests/cluecode/data/copyrights/mit_danse-mojibake.yml
+++ b/tests/cluecode/data/copyrights/mit_danse-mojibake.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: California Institute of Technology
     count: 1
+allrights:
+  - Copyright (c) 2009 California Institute of Technology. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/mit_danse.yml b/tests/cluecode/data/copyrights/mit_danse.yml
index b93446faaf..2b73c7f889 100644
--- a/tests/cluecode/data/copyrights/mit_danse.yml
+++ b/tests/cluecode/data/copyrights/mit_danse.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: California Institute of Technology
     count: 1
+allrights:
+  - Copyright (c) 2009 California Institute of Technology. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/mit_mlton-MIT_MLton.yml b/tests/cluecode/data/copyrights/mit_mlton-MIT_MLton.yml
index 8559b4c638..0b53d2fea3 100644
--- a/tests/cluecode/data/copyrights/mit_mlton-MIT_MLton.yml
+++ b/tests/cluecode/data/copyrights/mit_mlton-MIT_MLton.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: the NEC Research Institute
     count: 1
+allrights:
+  - Copyright (c) 1999-2006 Henry Cejtin, Matthew Fluet, Suresh Jagannathan, and Stephen Weeks.
+  - Copyright (c) 1997-2000 by the NEC Research Institute
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/mit_oldstyle_disclaimer4-MIT_OldStyle_disclaimer.yml b/tests/cluecode/data/copyrights/mit_oldstyle_disclaimer4-MIT_OldStyle_disclaimer.yml
index 414c00af47..b42155d8f7 100644
--- a/tests/cluecode/data/copyrights/mit_oldstyle_disclaimer4-MIT_OldStyle_disclaimer.yml
+++ b/tests/cluecode/data/copyrights/mit_oldstyle_disclaimer4-MIT_OldStyle_disclaimer.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 2001, 2002, 2003, 2004, 2005 by The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/mit_unicode-MIT_unicode.yml b/tests/cluecode/data/copyrights/mit_unicode-MIT_unicode.yml
index c785dd900a..8587319298 100644
--- a/tests/cluecode/data/copyrights/mit_unicode-MIT_unicode.yml
+++ b/tests/cluecode/data/copyrights/mit_unicode-MIT_unicode.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Unicode, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1991-2005 Unicode, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/mit_wordnet-MIT_WordNet.yml b/tests/cluecode/data/copyrights/mit_wordnet-MIT_WordNet.yml
index 4a6133d34c..81b539ef57 100644
--- a/tests/cluecode/data/copyrights/mit_wordnet-MIT_WordNet.yml
+++ b/tests/cluecode/data/copyrights/mit_wordnet-MIT_WordNet.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Princeton University
     count: 1
+allrights:
+  - Copyright 2006 by Princeton University. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/mitre-MITRE.yml b/tests/cluecode/data/copyrights/mitre-MITRE.yml
index 47a886c752..bab94479f8 100644
--- a/tests/cluecode/data/copyrights/mitre-MITRE.yml
+++ b/tests/cluecode/data/copyrights/mitre-MITRE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The MITRE Corporation
     count: 1
+allrights:
+  - Copyright (c) 1994-1999. The MITRE Corporation (http://www.mitre.org/). All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/motorola_c-c.c.yml b/tests/cluecode/data/copyrights/motorola_c-c.c.yml
index 5e5beb9cd7..db325dcecc 100644
--- a/tests/cluecode/data/copyrights/motorola_c-c.c.yml
+++ b/tests/cluecode/data/copyrights/motorola_c-c.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Motorola, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2003, 2010 Motorola, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/motorola_mobility_c-c.c.yml b/tests/cluecode/data/copyrights/motorola_mobility_c-c.c.yml
index d03cff9554..5a96c493d9 100644
--- a/tests/cluecode/data/copyrights/motorola_mobility_c-c.c.yml
+++ b/tests/cluecode/data/copyrights/motorola_mobility_c-c.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Motorola, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2009 Motorola, Inc. All Rights Reserved.
+  - Copyright (c) 2011 Motorola Mobility, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/msntp-MSNTP.yml b/tests/cluecode/data/copyrights/msntp-MSNTP.yml
index fcc5b5e1f1..5bf7f12a95 100644
--- a/tests/cluecode/data/copyrights/msntp-MSNTP.yml
+++ b/tests/cluecode/data/copyrights/msntp-MSNTP.yml
@@ -17,3 +17,8 @@ holders_summary:
     count: 2
   - value: University of Cambridge
     count: 2
+allrights:
+  - (c) Copyright, N.M. Maclaren, 1996, 1997, 2000
+  - (c) Copyright, University of Cambridge, 1996, 1997, 2000
+  - (c) Copyright N.M. Maclaren
+  - (c) Copyright University of Cambridge.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/multiline-Historical.txt.yml b/tests/cluecode/data/copyrights/multiline-Historical.txt.yml
index 0f12ec01c0..8d3034efe4 100644
--- a/tests/cluecode/data/copyrights/multiline-Historical.txt.yml
+++ b/tests/cluecode/data/copyrights/multiline-Historical.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: GEORGE J. CARRETTE, CONCORD, MASSACHUSETTS.
     count: 1
+allrights:
+  - COPYRIGHT (c) 1990-1994 BY GEORGE J. CARRETTE, CONCORD, MASSACHUSETTS. ALL RIGHTS RESERVED
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/multiple_copyrights.cpp.yml b/tests/cluecode/data/copyrights/multiple_copyrights.cpp.yml
index 10bc38329e..bc552c3386 100644
--- a/tests/cluecode/data/copyrights/multiple_copyrights.cpp.yml
+++ b/tests/cluecode/data/copyrights/multiple_copyrights.cpp.yml
@@ -14,3 +14,7 @@ copyrights_summary:
     count: 2
   - value: Copyright (c) 2000-2001 Alias Ltd.
     count: 1
+allrights:
+  - Copyright (c) Microsoft. All rights reserved.
+  - Copyright (c) 2000-2001 Alias Ltd. All rights reserved.
+  - Copyright (c) Microsoft.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/natural_docs.txt.yml b/tests/cluecode/data/copyrights/natural_docs.txt.yml
index abeee6fd4a..fdebfb2532 100644
--- a/tests/cluecode/data/copyrights/natural_docs.txt.yml
+++ b/tests/cluecode/data/copyrights/natural_docs.txt.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Greg Valure
     count: 1
+allrights:
+  - Copyright (c) 2009 by Dimitri van Heesch.
+  - Copyright (c) 2003-2008 Greg Valure
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/naumen-Naumen.yml b/tests/cluecode/data/copyrights/naumen-Naumen.yml
index db66f87c70..f6ebf2b716 100644
--- a/tests/cluecode/data/copyrights/naumen-Naumen.yml
+++ b/tests/cluecode/data/copyrights/naumen-Naumen.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: NAUMEN (tm) and Contributors
     count: 1
+allrights:
+  - Copyright (c) NAUMEN (tm) and Contributors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/naumen_txt.txt.yml b/tests/cluecode/data/copyrights/naumen_txt.txt.yml
index db66f87c70..f6ebf2b716 100644
--- a/tests/cluecode/data/copyrights/naumen_txt.txt.yml
+++ b/tests/cluecode/data/copyrights/naumen_txt.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: NAUMEN (tm) and Contributors
     count: 1
+allrights:
+  - Copyright (c) NAUMEN (tm) and Contributors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/netcomponents-NetComponents.yml b/tests/cluecode/data/copyrights/netcomponents-NetComponents.yml
index 8863c9836e..dde2869ea4 100644
--- a/tests/cluecode/data/copyrights/netcomponents-NetComponents.yml
+++ b/tests/cluecode/data/copyrights/netcomponents-NetComponents.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Daniel F. Savarese
     count: 1
+allrights:
+  - Copyright (c) 1996-1999 Daniel F. Savarese.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/nnp_and_co.txt.yml b/tests/cluecode/data/copyrights/nnp_and_co.txt.yml
index ffe9052301..17c61e6054 100644
--- a/tests/cluecode/data/copyrights/nnp_and_co.txt.yml
+++ b/tests/cluecode/data/copyrights/nnp_and_co.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Sandra and Klaus Rennecke
     count: 1
+allrights:
+  - Copyright (c) 2001, Sandra and Klaus Rennecke.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/no_punctuation_after_holder_name.txt.yml b/tests/cluecode/data/copyrights/no_punctuation_after_holder_name.txt.yml
index 3a1a7d7fbc..ba4b837225 100644
--- a/tests/cluecode/data/copyrights/no_punctuation_after_holder_name.txt.yml
+++ b/tests/cluecode/data/copyrights/no_punctuation_after_holder_name.txt.yml
@@ -5,3 +5,5 @@ copyrights:
   - (c) 1990-2005 Microsoft
 holders:
   - Microsoft
+allrights:
+  - (c) 1990-2005 Microsoft All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/nokia-Nokia.yml b/tests/cluecode/data/copyrights/nokia-Nokia.yml
index f58f5200a9..9cbc61f335 100644
--- a/tests/cluecode/data/copyrights/nokia-Nokia.yml
+++ b/tests/cluecode/data/copyrights/nokia-Nokia.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Nokia and others
     count: 1
+allrights:
+  - Copyright (c) Nokia and others. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/nokia_cpp-cpp.cpp.yml b/tests/cluecode/data/copyrights/nokia_cpp-cpp.cpp.yml
index 6ab6a16a5e..bb3a1f1051 100644
--- a/tests/cluecode/data/copyrights/nokia_cpp-cpp.cpp.yml
+++ b/tests/cluecode/data/copyrights/nokia_cpp-cpp.cpp.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Nokia Mobile Phones
     count: 1
+allrights:
+  - Copyright (c) 2002, Nokia Mobile Phones. All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/notice_name_before_statement-NOTICE.yml b/tests/cluecode/data/copyrights/notice_name_before_statement-NOTICE.yml
index 1fd0630c8f..dfdcb6d976 100644
--- a/tests/cluecode/data/copyrights/notice_name_before_statement-NOTICE.yml
+++ b/tests/cluecode/data/copyrights/notice_name_before_statement-NOTICE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: iClick, Inc., software
     count: 1
+allrights:
+  - at iClick, Inc., software copyright (c) 1999.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/notice_txt-NOTICE.txt.yml b/tests/cluecode/data/copyrights/notice_txt-NOTICE.txt.yml
index a0d29c601c..c37d71ba28 100644
--- a/tests/cluecode/data/copyrights/notice_txt-NOTICE.txt.yml
+++ b/tests/cluecode/data/copyrights/notice_txt-NOTICE.txt.yml
@@ -47,3 +47,16 @@ holders_summary:
     count: 1
   - value: http://xml.apache.org/xalan-j
     count: 1
+allrights:
+  - Copyright 2003-2010 The Knopflerfish Project http://www.knopflerfish.org
+  - Copyright (c) OSGi Alliance (2000, 2009). All Rights Reserved.
+  - Copyright (c) 2000-2005 INRIA, France Telecom All rights reserved.
+  - (c) 1999-2003.
+  - (c) 2001-2004 http://ws.apache.org/axis2
+  - Copyright (c) 2004, Didier Donsez
+  - (c) 2001-2004 http://commons.apache.org/logging
+  - (c) 1999-2003. http://xml.apache.org/dist/LICENSE.txt
+  - (c) 2001-2004
+  - Copyright (c) 2004, Richard S. Hall
+  - (c) 2001-2004 http://xml.apache.org/xalan-j
+  - (c) 2001-2004 http://xerces.apache.org
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/npl_v1_0-NPL_v.0.yml b/tests/cluecode/data/copyrights/npl_v1_0-NPL_v.0.yml
index 0cea716117..156b5206f4 100644
--- a/tests/cluecode/data/copyrights/npl_v1_0-NPL_v.0.yml
+++ b/tests/cluecode/data/copyrights/npl_v1_0-NPL_v.0.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Netscape Communications Corporation
     count: 1
+allrights:
+  - Copyright (c) 1998 Netscape Communications Corporation. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/nvidia_source-Nvidia_source.yml b/tests/cluecode/data/copyrights/nvidia_source-Nvidia_source.yml
index 9068a4ca6a..9a49de912f 100644
--- a/tests/cluecode/data/copyrights/nvidia_source-Nvidia_source.yml
+++ b/tests/cluecode/data/copyrights/nvidia_source-Nvidia_source.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: NVIDIA, Corp.
     count: 2
+allrights:
+  - Copyright (c) 1996-1998 NVIDIA, Corp. All rights reserved.
+  - Copyright (c) 1996-1998 NVIDIA, Corp.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/oclc_v1_0-OCLC_v.0.yml b/tests/cluecode/data/copyrights/oclc_v1_0-OCLC_v.0.yml
index 5ffd96c608..4722eacab3 100644
--- a/tests/cluecode/data/copyrights/oclc_v1_0-OCLC_v.0.yml
+++ b/tests/cluecode/data/copyrights/oclc_v1_0-OCLC_v.0.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: OCLC Research
     count: 1
+allrights:
+  - Copyright (c) 2000. OCLC Research. All Rights Reserved
+  - Copyright (c) 2000- (insert then current year) OCLC OCLC Research and others. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/oclc_v2_0-OCLC_v.0.yml b/tests/cluecode/data/copyrights/oclc_v2_0-OCLC_v.0.yml
index 5bf2d8c120..0c909b5924 100644
--- a/tests/cluecode/data/copyrights/oclc_v2_0-OCLC_v.0.yml
+++ b/tests/cluecode/data/copyrights/oclc_v2_0-OCLC_v.0.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 2
   - value: OCLC Research
     count: 1
+allrights:
+  - Copyright (c) 2002. OCLC Research. All Rights Reserved
+  - Copyright (c) 2000- (insert then current year) OCLC Online Computer Library Center, Inc. and other contributors. All rights reserved.
+  - Copyright (c) 2000- (insert then current year) OCLC Online Computer Library Center, Inc. and other contributors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/openldap-OpenLDAP.yml b/tests/cluecode/data/copyrights/openldap-OpenLDAP.yml
index 871e313e4f..5253703908 100644
--- a/tests/cluecode/data/copyrights/openldap-OpenLDAP.yml
+++ b/tests/cluecode/data/copyrights/openldap-OpenLDAP.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenLDAP Foundation, Redwood City, California, USA.
     count: 1
+allrights:
+  - Copyright 1999-2003 The OpenLDAP Foundation, Redwood City, California, USA. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/openoffice_org_report_builder_bin.copyright.yml b/tests/cluecode/data/copyrights/openoffice_org_report_builder_bin.copyright.yml
index 1702e60919..51b12fbd62 100644
--- a/tests/cluecode/data/copyrights/openoffice_org_report_builder_bin.copyright.yml
+++ b/tests/cluecode/data/copyrights/openoffice_org_report_builder_bin.copyright.yml
@@ -488,3 +488,155 @@ holders_summary:
     count: 1
   - value: ooo-build/Go-OO Team
     count: 1
+allrights:
+  - Copyright (c) 2002-2009 Software in the Public Interest, Inc.
+  - Copyright (c) 2002-2009 ooo-build/Go-OO Team
+  - (c) Sun Microsystems.
+  - Copyright 2002-2009 Sun Microsystems, Inc.
+  - Copyright 2002-2009 Sun Microsystems, Inc.
+  - Copyright (c) 2002-2005 Maxim Shemanarev
+  - Copyright 2001-2004 The Apache Software Foundation.
+  - Copyright 2003-2007 The Apache Software Foundation
+  - Copyright 2001-2007 The Apache Software Foundation
+  - Copyright 1999-2007 The Apache Software Foundation
+  - Copyright (c) 2000 Pat Niemeyer
+  - Copyright (c) 2000 INRIA, France Telecom
+  - Copyright (c) 2002 France Telecom
+  - Copyright (c) 1990-2003 Sleepycat Software
+  - Copyright (c) 1990, 1993, 1994, 1995 The Regents of the University of California
+  - Copyright (c) 2003 by Bitstream, Inc.
+  - Copyright (c) 2006 by Tavmjong Bah
+  - Copyright (c) 2007 Red Hat, Inc
+  - Copyright (c) 2007 Red Hat, Inc. All rights reserved.
+  - Copyright 2000-2003 Beman Dawes
+  - Copyright (c) 1998-2003 Joel de Guzman
+  - Copyright (c) 2001-2003 Daniel Nuffer
+  - Copyright (c) 2001-2003 Hartmut Kaiser
+  - Copyright (c) 2002-2003 Martin Wille
+  - Copyright (c) 2002 Juan Carlos Arevalo-Baeza
+  - Copyright (c) 2002 Raghavendra Satish
+  - Copyright (c) 2002 Jeff Westfahl
+  - Copyright (c) 2001 Bruce Florman
+  - Copyright 1999 Tom Tromey
+  - Copyright 2002, 2003 University of Southern California, Information Sciences Institute (ISI)
+  - Copyright 2004 David Reveman
+  - Copyright 2000, 2002, 2004, 2005 Keith Packard
+  - Copyright 2004 Calum Robinson
+  - Copyright 2004 Richard D. Worth
+  - Copyright 2004, 2005 Red Hat, Inc.
+  - Copyright 2004 David Reveman
+  - Copyright (c) Copyright 2000, Baptiste Lepilleur
+  - Copyright (c) 1996 - 2004, Daniel Stenberg
+  - Copyright (c) 1992,1994 by Dennis Vadura
+  - Copyright (c) 1996 by WTI Corp.
+  - Copyright 1999-2003 by Easy Software
+  - Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
+  - Copyright (c) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
+  - Copyright (c) 2000,2001,2002,2003 by George William
+  - Copyright (c) 2001-2008, The HSQL Development Group
+  - Copyright (c) 1995, 1997, 2000, 2001, 2002 Free Software Foundation, Inc.
+  - Copyright (c) Kevin Hendricks, 2001-2002
+  - Copyright (c) 2002-2008 Laszlo Nemeth
+  - Copyright (c) 2000 Bjoern Jacke
+  - Copyright 2000 by Sun Microsystems, Inc.
+  - Copyright (c) 1998 Raph Levien
+  - Copyright (c) 2001 ALTLinux, Moscow
+  - Copyright (c) 2006, 2007, 2008 Laszlo Nemeth
+  - Copyright (c) 2003-2006 The International Color Consortiu
+  - Copyright (c) 1995-2008 International Business Machines Corporation and others
+  - Copyright 2000-2005, by Object Refinery Limited
+  - Copyright 2005-2007, by Pentaho Corporation
+  - Copyright 1994-2002 World Wide Web Consortium
+  - Copyright (c) 1991-1998, Thomas G. Lane
+  - Copyright 1994-2002 World Wide Web Consortium
+  - Copyright (c) 2002 Anders Carlsson <andersca@gnu.org>
+  - Copyright (c) 2003, WiseGuys Internet B.V.
+  - Copyright (c) 2003, WiseGuys Internet B.V.
+  - Copyright 1997-1999 World Wide Web Consortium
+  - Copyright (c) 2002-2003 Aleksey Sanin
+  - Copyright (c) 2003 America Online, Inc.
+  - Copyright (c) 2001-2002 Daniel Veillard. All Rights Reserved.
+  - Copyright (c) 1998-2001 by the University of Florida
+  - Copyright (c) 1991, 2007 Free Software Foundation, Inc
+  - Copyright 2004 The Apache Software Foundation
+  - Copyright 2005 The Apache Software Foundation
+  - Copyright 2007 The Apache Software Foundation
+  - Copyright (c) 1999-2007 Brian Paul
+  - Copyright (c) 2007 The Khronos Group Inc.
+  - Copyright (c) 2003 Stuart Caie <kyzer@4u.net>
+  - Copyright (c) 1999-2006 Joe Orton <joe@manyfish.co.uk>
+  - Copyright (c) 1999-2000 Tommi Komulainen <Tommi.Komulainen@iki.fi>
+  - Copyright (c) 1999-2000 Peter Boos <pedib@colorfullife.com>
+  - Copyright (c) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+  - Copyright (c) 2004 Aleix Conchillo Flaque <aleix@member.fsf.org>
+  - Copyright (c) 2004 Jiang Lei <tristone@deluxe.ocn.ne.jp>
+  - Copyright (c) 2004-2005 Vladimir Berezniker @ http://public.xdi.org
+  - Copyright (c) 1998 Netscape Communications Corporation
+  - Copyright (c) 1998-2007 The OpenSSL Project
+  - Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved.
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 2001, 2002, 2003, 2004 Python Software Foundation
+  - Copyright (c) 2000 BeOpen.com
+  - Copyright (c) 1995-2001 Corporation for National Research Initiatives
+  - Copyright (c) 1991-1995 Stichting Mathematisch Centrum
+  - Copyright (c) 2000-2007 David Beckett
+  - Copyright (c) 2000-2005 University of Bristol
+  - Copyright (c) 1993, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc
+  - Copyright (c) 1997-2000 Netscape Communications Corporation
+  - Copyright (c) 2000 See Beyond Communications Corporation
+  - Copyright (c) 1997 David Mosberger-Tang and Andreas Beck
+  - Copyright (c) 1998, 1999 James Clark
+  - Copyright 1999 CERN - European Organization for Nuclear Research
+  - Copyright (c) 2002-2003 Aleksey Sanin
+  - Copyright (c) 2003 America Online, Inc.
+  - Copyright (c) 2001-2002 Daniel Veillard. All Rights Reserved.
+  - Copyright (c) 1998-2001 by the University of Florida
+  - Copyright (c) 1991, 2007 Free Software Foundation, Inc
+  - Copyright 2004 The Apache Software Foundation
+  - Copyright 2005 The Apache Software Foundation
+  - Copyright 2007 The Apache Software Foundation
+  - Copyright (c) 1999-2007 Brian Paul
+  - Copyright (c) 2007 The Khronos Group Inc.
+  - Copyright (c) 2003 Stuart Caie <kyzer@4u.net>
+  - Copyright (c) 1999-2006 Joe Orton <joe@manyfish.co.uk>
+  - Copyright (c) 1999-2000 Tommi Komulainen <Tommi.Komulainen@iki.fi>
+  - Copyright (c) 1999-2000 Peter Boos <pedib@colorfullife.com>
+  - Copyright (c) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+  - Copyright (c) 2004 Aleix Conchillo Flaque <aleix@member.fsf.org>
+  - Copyright (c) 2004 Jiang Lei <tristone@deluxe.ocn.ne.jp>
+  - Copyright (c) 2004-2005 Vladimir Berezniker @ http://public.xdi.org
+  - Copyright (c) 1998 Netscape Communications Corporation
+  - Copyright (c) 1998-2007 The OpenSSL Project
+  - Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved.
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 2001, 2002, 2003, 2004 Python Software Foundation
+  - Copyright (c) 2000 BeOpen.com
+  - Copyright (c) 1995-2001 Corporation for National Research Initiatives
+  - Copyright (c) 1991-1995 Stichting Mathematisch Centrum
+  - Copyright (c) 2000-2007 David Beckett
+  - Copyright (c) 2000-2005 University of Bristol
+  - Copyright (c) 1993, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc
+  - Copyright (c) 1997-2000 Netscape Communications Corporation
+  - Copyright (c) 2000 See Beyond Communications Corporation
+  - Copyright (c) 1997 David Mosberger-Tang and Andreas Beck
+  - Copyright (c) 1998, 1999 James Clark
+  - Copyright 1999 CERN - European Organization for Nuclear Research
+  - Copyright (c) 1994 Hewlett-Packard Company
+  - Copyright (c) 1996-1999 Silicon Graphics Computer Systems, Inc.
+  - Copyright (c) 1997 Moscow Center for SPARC Technology
+  - Copyright (c) 1999, 2000, 2001 Boris Fomitchev
+  - Copyright 1999-2002,2004 The Apache Software Foundation
+  - Copyright (c) 1991, 1992 TWAIN Working Group
+  - Copyright (c) 1997 TWAIN Working Group
+  - Copyright (c) 1998 TWAIN Working Group
+  - Copyright (c) 2000 TWAIN Working Group
+  - Copyright 1998-2001 by Ullrich Koethe
+  - Copyright 2004 by Urban Widmark
+  - Copyright 2002-2007 by Henrik Just
+  - Copyright (c) 2000, Compaq Computer Corporation
+  - Copyright (c) 2002, Hewlett Packard, Inc
+  - Copyright (c) 2000 SuSE, Inc.
+  - Copyright 1996-2007 Glyph & Cog, LLC.
+  - Copyright (c) 1995-2002 Jean-loup Gailly and Mark Adler
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/openpbs-OpenPBS.yml b/tests/cluecode/data/copyrights/openpbs-OpenPBS.yml
index 5a12d8daf8..347a2ed742 100644
--- a/tests/cluecode/data/copyrights/openpbs-OpenPBS.yml
+++ b/tests/cluecode/data/copyrights/openpbs-OpenPBS.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Veridian Information Solutions, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1999-2000 Veridian Information Solutions, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/openpublicationref-OpenPublicationref.yml b/tests/cluecode/data/copyrights/openpublicationref-OpenPublicationref.yml
index 54781089a5..226f1f48da 100644
--- a/tests/cluecode/data/copyrights/openpublicationref-OpenPublicationref.yml
+++ b/tests/cluecode/data/copyrights/openpublicationref-OpenPublicationref.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: ThisOldHouse
     count: 1
+allrights:
+  - Copyright (c) 2000 by ThisOldHouse.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/openssl-OpenSSL.yml b/tests/cluecode/data/copyrights/openssl-OpenSSL.yml
index ac7c65f226..57f0cb5e45 100644
--- a/tests/cluecode/data/copyrights/openssl-OpenSSL.yml
+++ b/tests/cluecode/data/copyrights/openssl-OpenSSL.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/openssl-c.c.yml b/tests/cluecode/data/copyrights/openssl-c.c.yml
index e7d4fec90e..9655fa7613 100644
--- a/tests/cluecode/data/copyrights/openssl-c.c.yml
+++ b/tests/cluecode/data/copyrights/openssl-c.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1997 Eric Young (eay@mincom.oz.au) All rights reserved.
+  - holder is Tim Hudson (tjh@mincom.oz.au).
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/opyrights.java.yml b/tests/cluecode/data/copyrights/opyrights.java.yml
index 85a251c63b..cb089d7cff 100644
--- a/tests/cluecode/data/copyrights/opyrights.java.yml
+++ b/tests/cluecode/data/copyrights/opyrights.java.yml
@@ -37,3 +37,13 @@ holders_summary:
     count: 1
   - value: Zeta Microcomputer Software
     count: 1
+allrights:
+  - (c) Copyright 2000-2005, by Object Refinery Limited and Contributors.
+  - Copyright (c) 2000-2004, by Thomas Morgner and Contributors.
+  - opylefted by -Harvie 2oo7
+  - Copyright (c) by Max Ziebell
+  - Copyright (c).
+  - Copyright (c) 1990 by Jon Orten Thunderball Cave BBS
+  - Copyright (c) by Zeta Microcomputer Software
+  - Copyright (c). 08/95, Abigwar
+  - Copyright (c) by Parik Rao.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/oracle.txt.yml b/tests/cluecode/data/copyrights/oracle.txt.yml
index d3878441d7..51868484de 100644
--- a/tests/cluecode/data/copyrights/oracle.txt.yml
+++ b/tests/cluecode/data/copyrights/oracle.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Oracle and/or its affiliates
     count: 1
+allrights:
+  - Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/osl_v3_0-OSL_v.0.yml b/tests/cluecode/data/copyrights/osl_v3_0-OSL_v.0.yml
index 44fd30660b..13cf9f8c47 100644
--- a/tests/cluecode/data/copyrights/osl_v3_0-OSL_v.0.yml
+++ b/tests/cluecode/data/copyrights/osl_v3_0-OSL_v.0.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Lawrence Rosen
     count: 1
+allrights:
+  - Copyright (c) 2005 Lawrence Rosen.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/partial_detection.txt.yml b/tests/cluecode/data/copyrights/partial_detection.txt.yml
index 3b0b0cc452..553eae72c9 100644
--- a/tests/cluecode/data/copyrights/partial_detection.txt.yml
+++ b/tests/cluecode/data/copyrights/partial_detection.txt.yml
@@ -66,3 +66,19 @@ holders_summary:
     count: 1
   - value: the Perl 5 Porters
     count: 1
+allrights:
+  - Copyright 1991 by the Massachusetts Institute of Technology
+  - Copyright (c) 2001 AT&T
+  - Copyright (c) 2004-2006 by Henrique de Moraes Holschuh <hmh@debian.org>
+  - Copyright 2005-2007 Christopher Montgomery, Jean-Marc Valin, Timothy Terriberry, CSIRO, and other contributors
+  - Copyright (c) 2007 James Newton-King
+  - Copyright (c) 2006, SHIMODA Hiroshi <piro@p.club.ne.jp>
+  - Copyright (c) 2006, FUJITA Yuji <yuji@webmasters.gr.jp>
+  - Copyright (c) 2002-2009 ooo-build/Go-OO Team
+  - Copyright (c) 2002-2009 Software in the Public Interest, Inc.
+  - Copyright (c) 2004 by the Perl 5 Porters. All rights reserved.
+  - Copyright (c) 2006 Academy of Motion Picture Arts and Sciences
+  - Copyright (c) 1995-2000 Corporation for National Research Initiatives
+  - Copyright (c) 2001 EU DataGrid
+  - Copyright (c) 2000. OCLC Research
+  - Copyright (c) 1999 Trolltech AS, Norway
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/partial_detection_mit.txt.yml b/tests/cluecode/data/copyrights/partial_detection_mit.txt.yml
index 3b0b0cc452..553eae72c9 100644
--- a/tests/cluecode/data/copyrights/partial_detection_mit.txt.yml
+++ b/tests/cluecode/data/copyrights/partial_detection_mit.txt.yml
@@ -66,3 +66,19 @@ holders_summary:
     count: 1
   - value: the Perl 5 Porters
     count: 1
+allrights:
+  - Copyright 1991 by the Massachusetts Institute of Technology
+  - Copyright (c) 2001 AT&T
+  - Copyright (c) 2004-2006 by Henrique de Moraes Holschuh <hmh@debian.org>
+  - Copyright 2005-2007 Christopher Montgomery, Jean-Marc Valin, Timothy Terriberry, CSIRO, and other contributors
+  - Copyright (c) 2007 James Newton-King
+  - Copyright (c) 2006, SHIMODA Hiroshi <piro@p.club.ne.jp>
+  - Copyright (c) 2006, FUJITA Yuji <yuji@webmasters.gr.jp>
+  - Copyright (c) 2002-2009 ooo-build/Go-OO Team
+  - Copyright (c) 2002-2009 Software in the Public Interest, Inc.
+  - Copyright (c) 2004 by the Perl 5 Porters. All rights reserved.
+  - Copyright (c) 2006 Academy of Motion Picture Arts and Sciences
+  - Copyright (c) 1995-2000 Corporation for National Research Initiatives
+  - Copyright (c) 2001 EU DataGrid
+  - Copyright (c) 2000. OCLC Research
+  - Copyright (c) 1999 Trolltech AS, Norway
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/perl_base-perl_base.copyright.yml b/tests/cluecode/data/copyrights/perl_base-perl_base.copyright.yml
index ae30e848a2..d63495e3d2 100644
--- a/tests/cluecode/data/copyrights/perl_base-perl_base.copyright.yml
+++ b/tests/cluecode/data/copyrights/perl_base-perl_base.copyright.yml
@@ -35,3 +35,13 @@ holders_summary:
     count: 1
   - value: the Perl 5 Porters
     count: 1
+allrights:
+  - Copyright 1989-2001, Larry Wall All rights reserved.
+  - Copyright (c) 1995-2005 Jean-loup Gailly and Mark Adler
+  - Copyright (c) 1991-2006 Unicode, Inc.
+  - Copyright (c) 1991-2008 Unicode, Inc. All rights reserved.
+  - Copyright (c) 2004 by the Perl 5 Porters. All rights reserved.
+  - copyright (c) 1994 by the Regents of the University of California. All rights reserved.
+  - Copyright (c) 1994 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 1989, 1993 The Regents of the University of California. All rights reserved.
+  - copyright (c) 1996-2007 Julian R Seward. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/phorum-Phorum.yml b/tests/cluecode/data/copyrights/phorum-Phorum.yml
index 5762ecd001..75f2698b3b 100644
--- a/tests/cluecode/data/copyrights/phorum-Phorum.yml
+++ b/tests/cluecode/data/copyrights/phorum-Phorum.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Phorum Development Team
     count: 1
+allrights:
+  - Copyright (c) 2001 The Phorum Development Team. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/pine-Pine.yml b/tests/cluecode/data/copyrights/pine-Pine.yml
index 2f96fc905d..a576170c7a 100644
--- a/tests/cluecode/data/copyrights/pine-Pine.yml
+++ b/tests/cluecode/data/copyrights/pine-Pine.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: the University of Washington
     count: 1
+allrights:
+  - Copyright 1989-2007 by the University of Washington.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/postgresql_8_3-postgresql.label.yml b/tests/cluecode/data/copyrights/postgresql_8_3-postgresql.label.yml
index 55d1055aef..374f56b40c 100644
--- a/tests/cluecode/data/copyrights/postgresql_8_3-postgresql.label.yml
+++ b/tests/cluecode/data/copyrights/postgresql_8_3-postgresql.label.yml
@@ -24,3 +24,8 @@ holders_summary:
   - value: the Regents of the University of California, Sun Microsystems, Inc., Scriptics Corporation,
       ActiveState Corporation
     count: 1
+allrights:
+  - Portions Copyright (c) 1996-2003, The PostgreSQL Global Development Group
+  - Portions Copyright (c) 1994, The Regents of the University of California
+  - Copyright (c) 1998, 1999 Henry Spencer. All rights reserved.
+  - copyrighted by the Regents of the University of California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState Corporation
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/present_year_range.txt.yml b/tests/cluecode/data/copyrights/present_year_range.txt.yml
index b3d4e33720..28b6d773b7 100644
--- a/tests/cluecode/data/copyrights/present_year_range.txt.yml
+++ b/tests/cluecode/data/copyrights/present_year_range.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Adobe Systems Incorporated
     count: 1
+allrights:
+  - Copyright (c) 2012 - present Adobe Systems Incorporated. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/properties-properties.properties.yml b/tests/cluecode/data/copyrights/properties-properties.properties.yml
index a37b6a4c2b..5714c5b8da 100644
--- a/tests/cluecode/data/copyrights/properties-properties.properties.yml
+++ b/tests/cluecode/data/copyrights/properties-properties.properties.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Restaurant
     count: 1
+allrights:
+  - (c) 2004-2007 Restaurant. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/psf_in_python-BitVector_py.py.yml b/tests/cluecode/data/copyrights/psf_in_python-BitVector_py.py.yml
index ac8d7f4cd6..ae810a20ef 100644
--- a/tests/cluecode/data/copyrights/psf_in_python-BitVector_py.py.yml
+++ b/tests/cluecode/data/copyrights/psf_in_python-BitVector_py.py.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Avinash Kak. Python Software Foundation
     count: 1
+allrights:
+  - (c) 2008 Avinash Kak. Python Software Foundation.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/python_dateutil-python_dateutil.copyright.yml b/tests/cluecode/data/copyrights/python_dateutil-python_dateutil.copyright.yml
index 62febc2e66..bfd7865822 100644
--- a/tests/cluecode/data/copyrights/python_dateutil-python_dateutil.copyright.yml
+++ b/tests/cluecode/data/copyrights/python_dateutil-python_dateutil.copyright.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Stichting Mathematisch Centrum Amsterdam, The Netherlands
     count: 1
+allrights:
+  - Copyright (c) 2001, 2002 Python Software Foundation All Rights Reserved
+  - Copyright (c) 1995-2001 Corporation for National Research Initiatives All Rights Reserved
+  - Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, The Netherlands. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/python_v1_6-Python_v.6.yml b/tests/cluecode/data/copyrights/python_v1_6-Python_v.6.yml
index 4b12e6dc68..0e79e102aa 100644
--- a/tests/cluecode/data/copyrights/python_v1_6-Python_v.6.yml
+++ b/tests/cluecode/data/copyrights/python_v1_6-Python_v.6.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Corporation for National Research Initiatives
     count: 1
+allrights:
+  - Copyright (c) 1995-2000 Corporation for National Research Initiatives All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/python_v1_6_1-Python_v.1.yml b/tests/cluecode/data/copyrights/python_v1_6_1-Python_v.1.yml
index 9c58f3cf66..6cf48e02ba 100644
--- a/tests/cluecode/data/copyrights/python_v1_6_1-Python_v.1.yml
+++ b/tests/cluecode/data/copyrights/python_v1_6_1-Python_v.1.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Corporation for National Research Initiatives
     count: 1
+allrights:
+  - Copyright 1995-2001 Corporation for National Research Initiatives All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/python_v2-Python_v.yml b/tests/cluecode/data/copyrights/python_v2-Python_v.yml
index c1ffb40de9..83273da953 100644
--- a/tests/cluecode/data/copyrights/python_v2-Python_v.yml
+++ b/tests/cluecode/data/copyrights/python_v2-Python_v.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Python Software Foundation
     count: 1
+allrights:
+  - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation All Rights Reserved
+  - Copyright (c) 1995-2001 Corporation for National Research Initiatives All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/qpl_v1_0-QPL_v.0.yml b/tests/cluecode/data/copyrights/qpl_v1_0-QPL_v.0.yml
index 4805d430d8..88623fb494 100644
--- a/tests/cluecode/data/copyrights/qpl_v1_0-QPL_v.0.yml
+++ b/tests/cluecode/data/copyrights/qpl_v1_0-QPL_v.0.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Trolltech AS, Norway
     count: 1
+allrights:
+  - Copyright (c) 1999 Trolltech AS, Norway.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/rda.c.yml b/tests/cluecode/data/copyrights/rda.c.yml
index 76fbf957b9..f7ea26d52b 100644
--- a/tests/cluecode/data/copyrights/rda.c.yml
+++ b/tests/cluecode/data/copyrights/rda.c.yml
@@ -83,3 +83,25 @@ holders_summary:
     count: 1
   - value: Yann Collet
     count: 1
+allrights:
+  - Copyright 2001-2011 Xiph.Org, Skype Limited, Octasic
+  - Copyright 2003-2017, BugSplat.
+  - Copyright 2009-2011 Intel Corporation
+  - Copyright 2017 Intel Corporation
+  - Copyright (c) 2003-2018 Ready At Dawn Studios LLC.
+  - Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler
+  - Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
+  - Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
+  - Copyright (c) 1996 - 2018, Daniel Stenberg, <daniel@haxx.se>
+  - Copyright (c) 2006, Google Inc.
+  - Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez@gmail.com>
+  - Copyright (c) 2009-2014 Petri Lehtinen <petri@digip.org>
+  - Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis@gmail.com>
+  - Copyright (c) 2011-2016, Yann Collet.
+  - Copyright (c) 2012 NVIDIA Corporation. All rights reserved.
+  - Copyright (c) 2016-present, Facebook, Inc. All rights reserved.
+  - Copyright (c) 2017 Advanced Micro Devices, Inc.
+  - Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved.
+  - Copyright (c) 2017-present, Facebook, Inc. All rights reserved.
+  - Copyright (c) 2018 William Pitcock <nenolod@dereferenced.org>
+  - Copyright (c) Facebook Technologies, LLC and its affiliates.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/realpsl_v1_0-RealPSL_v.0.yml b/tests/cluecode/data/copyrights/realpsl_v1_0-RealPSL_v.0.yml
index 11d59690c2..67d939c509 100644
--- a/tests/cluecode/data/copyrights/realpsl_v1_0-RealPSL_v.0.yml
+++ b/tests/cluecode/data/copyrights/realpsl_v1_0-RealPSL_v.0.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: RealNetworks, Inc. and/or its licensors
     count: 1
+allrights:
+  - Copyright (c) 1995-2002 RealNetworks, Inc. and/or its licensors. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/realpsl_v1_0ref-RealPSL_v_ref.0ref.yml b/tests/cluecode/data/copyrights/realpsl_v1_0ref-RealPSL_v_ref.0ref.yml
index 435da2be3c..ec4bbe2fcf 100644
--- a/tests/cluecode/data/copyrights/realpsl_v1_0ref-RealPSL_v_ref.0ref.yml
+++ b/tests/cluecode/data/copyrights/realpsl_v1_0ref-RealPSL_v_ref.0ref.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: RealNetworks, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/reciprocal_v1_5-Reciprocal_v.5.yml b/tests/cluecode/data/copyrights/reciprocal_v1_5-Reciprocal_v.5.yml
index 35c2911288..3a85d23790 100644
--- a/tests/cluecode/data/copyrights/reciprocal_v1_5-Reciprocal_v.5.yml
+++ b/tests/cluecode/data/copyrights/reciprocal_v1_5-Reciprocal_v.5.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Technical Pursuit Inc.
     count: 1
+allrights:
+  - Copyright (c) 2001-2007 Technical Pursuit Inc., All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/red_hat_openoffice_org_report_builder_bin-openoffice_org_report_builder_bin.copyright.yml b/tests/cluecode/data/copyrights/red_hat_openoffice_org_report_builder_bin-openoffice_org_report_builder_bin.copyright.yml
index 092ad398a8..56cc953d79 100644
--- a/tests/cluecode/data/copyrights/red_hat_openoffice_org_report_builder_bin-openoffice_org_report_builder_bin.copyright.yml
+++ b/tests/cluecode/data/copyrights/red_hat_openoffice_org_report_builder_bin-openoffice_org_report_builder_bin.copyright.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Red Hat
     count: 2
+allrights:
+  - Copyright (c) 2007 Red Hat, Inc
+  - Copyright (c) 2007 Red Hat, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/redhatref-RedHatref.yml b/tests/cluecode/data/copyrights/redhatref-RedHatref.yml
index c9c240f107..e34f5c7c45 100644
--- a/tests/cluecode/data/copyrights/redhatref-RedHatref.yml
+++ b/tests/cluecode/data/copyrights/redhatref-RedHatref.yml
@@ -15,3 +15,7 @@ holders_summary:
     count: 2
   - value: Red Hat, Inc. and others
     count: 1
+allrights:
+  - Copyright (c) 2005 Red Hat, Inc.
+  - Copyright (c) 1995-2005 Red Hat, Inc. and others.
+  - copyrighted by Red Hat, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/regents_complex-strtol_c.c.yml b/tests/cluecode/data/copyrights/regents_complex-strtol_c.c.yml
index d3cddab4ea..45e2c12542 100644
--- a/tests/cluecode/data/copyrights/regents_complex-strtol_c.c.yml
+++ b/tests/cluecode/data/copyrights/regents_complex-strtol_c.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1990 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/regents_license-LICENSE.yml b/tests/cluecode/data/copyrights/regents_license-LICENSE.yml
index fe904f0ee9..e1520709a0 100644
--- a/tests/cluecode/data/copyrights/regents_license-LICENSE.yml
+++ b/tests/cluecode/data/copyrights/regents_license-LICENSE.yml
@@ -20,3 +20,8 @@ holders_summary:
     count: 1
   - value: the Institute of Electrical and Electronics Engineers, Inc.
     count: 1
+allrights:
+  - copyrighted by The Regents of the University of California.
+  - Copyright 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994 The Regents of the University of California. All rights reserved.
+  - copyright C 1988 by the Institute of Electrical and Electronics Engineers, Inc.
+  - copyright of UC Berkeley's Berkeley Software
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/ricoh_v1_0-Ricoh_v.0.yml b/tests/cluecode/data/copyrights/ricoh_v1_0-Ricoh_v.0.yml
index 0e559bc07d..80126cf62c 100644
--- a/tests/cluecode/data/copyrights/ricoh_v1_0-Ricoh_v.0.yml
+++ b/tests/cluecode/data/copyrights/ricoh_v1_0-Ricoh_v.0.yml
@@ -5,3 +5,5 @@ what:
 copyrights:
   - Copyright (c) 1995-1999
 notes: the trailing are is rare enough not to be made an exception
+allrights:
+  - Copyright (c) 1995-1999. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/rim.txt.yml b/tests/cluecode/data/copyrights/rim.txt.yml
index 39cb0870f5..b2054668b2 100644
--- a/tests/cluecode/data/copyrights/rim.txt.yml
+++ b/tests/cluecode/data/copyrights/rim.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Research In Motion Limited
     count: 1
+allrights:
+  - Copyright (c) Research In Motion Limited 2010. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/s_fabsl_c-s_fabsl_c.c.yml b/tests/cluecode/data/copyrights/s_fabsl_c-s_fabsl_c.c.yml
index 94bede6cbe..b7db6412ea 100644
--- a/tests/cluecode/data/copyrights/s_fabsl_c-s_fabsl_c.c.yml
+++ b/tests/cluecode/data/copyrights/s_fabsl_c-s_fabsl_c.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Dag-Erling Coidan Smorgrav
     count: 1
+allrights:
+  - Copyright (c) 2003 Dag-Erling Coidan Smorgrav All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/sample_py-py.py.yml b/tests/cluecode/data/copyrights/sample_py-py.py.yml
index 56de5e6eb8..6db3b3fd64 100644
--- a/tests/cluecode/data/copyrights/sample_py-py.py.yml
+++ b/tests/cluecode/data/copyrights/sample_py-py.py.yml
@@ -9,3 +9,7 @@ holders:
   - ABC ABC CONFIDENTIAL PROPRIETARY
   - Motorola, Inc. - Motorola Confidential Proprietary
   - Metalink L.T.D.
+allrights:
+  - COPYRIGHT 2006 ABC ABC CONFIDENTIAL PROPRIETARY
+  - Copyright 2006 (c), Motorola, Inc. - Motorola Confidential Proprietary
+  - Metalink L.T.D. (c) Copyright 2006.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/scilab-Scilab.yml b/tests/cluecode/data/copyrights/scilab-Scilab.yml
index 7c92e80883..5df8357fc5 100644
--- a/tests/cluecode/data/copyrights/scilab-Scilab.yml
+++ b/tests/cluecode/data/copyrights/scilab-Scilab.yml
@@ -28,3 +28,10 @@ expected_failures:
   - holders
   - authors
   - holders_summary
+allrights:
+  - Scilab (c) INRIA-ENPC.
+  - Scilab (c) INRIA-ENPC.
+  - Scilab (c) INRIA-ENPC.
+  - Scilab inside (c) INRIA-ENPC
+  - Scilab (c) INRIA-ENPC
+  - Scilab (c) INRIA-ENPC
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/seahorse_plugins-seahorse_plugins.copyright.yml b/tests/cluecode/data/copyrights/seahorse_plugins-seahorse_plugins.copyright.yml
index cdb8d29f58..c46b48dea0 100644
--- a/tests/cluecode/data/copyrights/seahorse_plugins-seahorse_plugins.copyright.yml
+++ b/tests/cluecode/data/copyrights/seahorse_plugins-seahorse_plugins.copyright.yml
@@ -181,3 +181,46 @@ notes: |
               Copyright (c) 1998-2006 by the....
               and this is not detected
               following: Dave Ahlswede, Manuel Amador, Matt Amato, Daniel Atallah, Paul Aurich, Patrick Aussems, Anibal Avelar, Alex Badea, John Bailey, Chris Banal, Luca Barbato, Levi Bard, Kevin Barry, Derek Battams, Martin Bayard, Curtis Beattie, Dave Bell, Igor Belyi, Brian Bernas, Paul Betts, Jonas Birme, Eric Blade, Ethan Blanton, Joshua Blanton, Rainer Blessing, Herman Bloggs, David Blue, Jason Boerner, Graham Booker, Paolo Borelli, Julien Bossart, Craig Boston, Chris Boyle, Derrick J Brashear, Matt Brenneke, Jeremy Brooks, Philip Brown, Sean Burke, Thomas Butter, Andrea Canciani, Damien Carbery, Michael Carlson, Keegan Carruthers-Smith, Steve Cavilia, Julien Cegarra, Cerulean Studios, LLC
+allrights:
+  - Copyright (c) 2004-2007 Stefan Walter
+  - Copyright (c) 2004-2006 Adam Schreiber
+  - Copyright (c) 2001-2003 Jose Carlos Garcia Sogo
+  - Copyright (c) 2002, 2003 Jacob Perkins
+  - Copyright (c) 2004, 2006 Nate Nielsen
+  - Copyright (c) 2000-2004 Marco Pesenti Gritti
+  - Copyright (c) 2003-2006 Christian Persch
+  - Copyright (c) 2004, 2006 Jean-Francois Rameau
+  - Copyright (c) 2000, 2001 Eazel, Inc.
+  - Copyright (c) 2007, 2008 Jorge Gonzalez
+  - Copyright (c) 2007, 2008 Daniel Nylander
+  - Copyright (c) 2004-2005 Shaun McCance
+  - Copyright (c) 2007 Milo Casagrande
+  - Copyright (c) 2007-2008 Claude Paroz
+  - Copyright (c) 2007 GNOME i18n Project for Vietnamese
+  - Copyright (c) 2008 Vasilii Faronov
+  - Copyright (c) 1992-2008 Free Software Foundation, Inc.
+  - Copyright (c) 1999 Dave Camp
+  - Copyright (c) 2005 Tecsidel S.A.
+  - Copyright (c) 2004-2005 Adam Weinberger and the GNOME Foundation
+  - Copyright (c) 2007, 2008 The GNOME Project
+  - Copyright (c) 2007 Swecha Telugu Localisation Team
+  - Copyright (c) 1995-1997 Ulrich Drepper
+  - Copyright (c) 2004-2008 Rodney Dawes
+  - Copyright (c) 1999, 2000 Anthony Mulcahy
+  - Copyright (c) 2007 Ihar Hrachyshka
+  - Copyright (c) 2004, 2005 Miloslav Trmac
+  - Copyright (c) 2003 Peter Mato
+  - Copyright (c) 2004, 2005 Danijel Studen, Denis Lackovic, Ivan Jankovic
+  - Copyright (c) 1994 X Consortium
+  - Copyright (c) 2006 Alexander Larsson
+  - Copyright (c) 2000-2003 Ximian Inc.
+  - Copyright (c) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+  - Copyright (c) 1999, 2000 Robert Bihlmeyer
+  - Copyright (c) Crispin Flowerday
+  - Copyright (c) 2008 Frederic Peters
+  - Copyright (c) 2008 Lucas Lommer
+  - Copyright (c) 2008 Mario Blattermann
+  - Copyright (c) 2001-2004 Red Hat, Inc.
+  - Copyright (c) 2004 Scott James Remnant
+  - Copyright (c) 1998-2006 by the
+  - Copyright (c) 2008 Sebastien Bacher, Andreas Moog, Emilio Pozuelo Monfort and Josselin Mouette.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/sgi_cid_v1_0-SGI_CID_v.0.yml b/tests/cluecode/data/copyrights/sgi_cid_v1_0-SGI_CID_v.0.yml
index 92b03a6b20..207b7ac505 100644
--- a/tests/cluecode/data/copyrights/sgi_cid_v1_0-SGI_CID_v.0.yml
+++ b/tests/cluecode/data/copyrights/sgi_cid_v1_0-SGI_CID_v.0.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Silicon Graphics, Inc.
     count: 2
+allrights:
+  - Copyright (c) 1994-1999 Silicon Graphics, Inc.
+  - Copyright (c) 1994-1999 Silicon Graphics, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/sgi_glx_v1_0-SGI_GLX_v.0.yml b/tests/cluecode/data/copyrights/sgi_glx_v1_0-SGI_GLX_v.0.yml
index 6ae61ff9b8..7b5f669b41 100644
--- a/tests/cluecode/data/copyrights/sgi_glx_v1_0-SGI_GLX_v.0.yml
+++ b/tests/cluecode/data/copyrights/sgi_glx_v1_0-SGI_GLX_v.0.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Silicon Graphics, Inc.
     count: 1
+allrights:
+  - (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/sinica.txt.yml b/tests/cluecode/data/copyrights/sinica.txt.yml
index 7129aa07b6..5a5bde1dee 100644
--- a/tests/cluecode/data/copyrights/sinica.txt.yml
+++ b/tests/cluecode/data/copyrights/sinica.txt.yml
@@ -11,3 +11,5 @@ holders_summary:
   - value: Computer Systems and Communication Lab, Institute of Information Science, Academia
       Sinica
     count: 1
+allrights:
+  - Copyright (c) 1999 Computer Systems and Communication Lab, Institute of Information Science, Academia Sinica.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/sleepycat-Sleepycat.yml b/tests/cluecode/data/copyrights/sleepycat-Sleepycat.yml
index d14ebe9e41..c9e0373124 100644
--- a/tests/cluecode/data/copyrights/sleepycat-Sleepycat.yml
+++ b/tests/cluecode/data/copyrights/sleepycat-Sleepycat.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Sleepycat Software
     count: 1
+allrights:
+  - Copyright (c) 1990-1999 Sleepycat Software. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/somefile_cpp-somefile_cpp.cpp.yml b/tests/cluecode/data/copyrights/somefile_cpp-somefile_cpp.cpp.yml
index 97871aac1f..eb576099e7 100644
--- a/tests/cluecode/data/copyrights/somefile_cpp-somefile_cpp.cpp.yml
+++ b/tests/cluecode/data/copyrights/somefile_cpp-somefile_cpp.cpp.yml
@@ -15,3 +15,7 @@ holders_summary:
     count: 2
   - value: Foobar Company (PC) Property of Foobar Company
     count: 1
+allrights:
+  - Foobar Company, All Rights Reserved, (c) 2005
+  - Copyright Foobar Company (PC) Property of Foobar Company
+  - Copyright (2003) Foobar Company All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/statements_in_licenses/lowercase_werken.txt.yml b/tests/cluecode/data/copyrights/statements_in_licenses/lowercase_werken.txt.yml
index d389adc362..10e1be06d9 100644
--- a/tests/cluecode/data/copyrights/statements_in_licenses/lowercase_werken.txt.yml
+++ b/tests/cluecode/data/copyrights/statements_in_licenses/lowercase_werken.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: werken digital
     count: 1
+allrights:
+  - Copyright (c) 2000-2002 werken digital. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/statements_in_licenses/metastuff.txt.yml b/tests/cluecode/data/copyrights/statements_in_licenses/metastuff.txt.yml
index d8ca44344c..5cb4732347 100644
--- a/tests/cluecode/data/copyrights/statements_in_licenses/metastuff.txt.yml
+++ b/tests/cluecode/data/copyrights/statements_in_licenses/metastuff.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: MetaStuff, Ltd.
     count: 1
+allrights:
+  - Copyright 2001-2005 (c) MetaStuff, Ltd. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/statements_in_licenses/project_mayo.txt.yml b/tests/cluecode/data/copyrights/statements_in_licenses/project_mayo.txt.yml
index 53837b609e..7579f14d8a 100644
--- a/tests/cluecode/data/copyrights/statements_in_licenses/project_mayo.txt.yml
+++ b/tests/cluecode/data/copyrights/statements_in_licenses/project_mayo.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Project Mayo
     count: 1
+allrights:
+  - Copyright (c) 2001 Project Mayo.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/statements_in_licenses/slash_in_name.txt.yml b/tests/cluecode/data/copyrights/statements_in_licenses/slash_in_name.txt.yml
index afe7232784..714db25305 100644
--- a/tests/cluecode/data/copyrights/statements_in_licenses/slash_in_name.txt.yml
+++ b/tests/cluecode/data/copyrights/statements_in_licenses/slash_in_name.txt.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: University Corporation for Atmospheric Research/Unidata
     count: 1
+allrights:
+  - Copyright 1993-2014 University Corporation for Atmospheric Research/Unidata
+  - copyright 1991-1998 by LCS/Telegraphics.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/stmicro_in_h-h.h.yml b/tests/cluecode/data/copyrights/stmicro_in_h-h.h.yml
index 07e66a4a28..5bdf2e341f 100644
--- a/tests/cluecode/data/copyrights/stmicro_in_h-h.h.yml
+++ b/tests/cluecode/data/copyrights/stmicro_in_h-h.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: ST-Microelectronics
     count: 1
+allrights:
+  - COPYRIGHT (c) ST-Microelectronics 1998.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/stmicro_in_txt.txt.yml b/tests/cluecode/data/copyrights/stmicro_in_txt.txt.yml
index ca4d3cbd62..8e70c0ae40 100644
--- a/tests/cluecode/data/copyrights/stmicro_in_txt.txt.yml
+++ b/tests/cluecode/data/copyrights/stmicro_in_txt.txt.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: STMicroelectronics
     count: 1
+allrights:
+  - COPYRIGHT (c) STMicroelectronics 2005.
+  - COPYRIGHT (c) ST-Microelectronics 1998.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/super_tech_c-c.c.yml b/tests/cluecode/data/copyrights/super_tech_c-c.c.yml
index 2ff78ee8f4..223794cb56 100644
--- a/tests/cluecode/data/copyrights/super_tech_c-c.c.yml
+++ b/tests/cluecode/data/copyrights/super_tech_c-c.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Super Technologies Corporation, Cedar Rapids, Iowa, U.S.A.
     count: 1
+allrights:
+  - Copyright (c) $LastChangedDate$ Super Technologies Corporation, Cedar Rapids, Iowa, U.S.A. ALL RIGHTS RESERVED
+  - Copyright (c) 2004 Benjamin Herrenschmuidt (benh@kernel.crashing.org), IBM Corp.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/sybaseopenwatcom_v1_0-SybaseOpenWatcom_v.0.yml b/tests/cluecode/data/copyrights/sybaseopenwatcom_v1_0-SybaseOpenWatcom_v.0.yml
index a77d745540..eb92e61282 100644
--- a/tests/cluecode/data/copyrights/sybaseopenwatcom_v1_0-SybaseOpenWatcom_v.0.yml
+++ b/tests/cluecode/data/copyrights/sybaseopenwatcom_v1_0-SybaseOpenWatcom_v.0.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Sybase, Inc.
     count: 1
+allrights:
+  - Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/the_native_web.txt.yml b/tests/cluecode/data/copyrights/the_native_web.txt.yml
index 5d01321833..4d65bbbd0d 100644
--- a/tests/cluecode/data/copyrights/the_native_web.txt.yml
+++ b/tests/cluecode/data/copyrights/the_native_web.txt.yml
@@ -5,3 +5,5 @@ copyrights:
   - Copyright (c) 2014-2018 the native web
 holders:
   - the native web
+allrights:
+  - Copyright (c) 2014-2018 the native web.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/thirdpartyproject_prop-ThirdPartyProject_prop.prop.yml b/tests/cluecode/data/copyrights/thirdpartyproject_prop-ThirdPartyProject_prop.prop.yml
index fd28a94506..9c653dcd8e 100644
--- a/tests/cluecode/data/copyrights/thirdpartyproject_prop-ThirdPartyProject_prop.prop.yml
+++ b/tests/cluecode/data/copyrights/thirdpartyproject_prop-ThirdPartyProject_prop.prop.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2010 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/toolchain.txt.yml b/tests/cluecode/data/copyrights/toolchain.txt.yml
index de917d25e7..ab4a3df9fd 100644
--- a/tests/cluecode/data/copyrights/toolchain.txt.yml
+++ b/tests/cluecode/data/copyrights/toolchain.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: lowRISC contributors
     count: 1
+allrights:
+  - Copyright lowRISC contributors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/trailing_For-c.c.yml b/tests/cluecode/data/copyrights/trailing_For-c.c.yml
index 52757fd41e..141492888d 100644
--- a/tests/cluecode/data/copyrights/trailing_For-c.c.yml
+++ b/tests/cluecode/data/copyrights/trailing_For-c.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Mycom Pany, inc.
     count: 1
+allrights:
+  - Copyright 2008 Mycom Pany, inc.
+  - Copyright (c) 1995-2003 Jean-loup Gailly.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/trailing_redistribution-bspatch_c.c.yml b/tests/cluecode/data/copyrights/trailing_redistribution-bspatch_c.c.yml
index 31dc2984b8..e63c62ce01 100644
--- a/tests/cluecode/data/copyrights/trailing_redistribution-bspatch_c.c.yml
+++ b/tests/cluecode/data/copyrights/trailing_redistribution-bspatch_c.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Colin Percival
     count: 1
+allrights:
+  - Copyright (c) 2008 The Android Open Source Project
+  - Copyright 2003-2005 Colin Percival All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/transfig_with_parts-transfig.copyright.yml b/tests/cluecode/data/copyrights/transfig_with_parts-transfig.copyright.yml
index 55c61ec965..f850bbeaec 100644
--- a/tests/cluecode/data/copyrights/transfig_with_parts-transfig.copyright.yml
+++ b/tests/cluecode/data/copyrights/transfig_with_parts-transfig.copyright.yml
@@ -73,3 +73,21 @@ holders_summary:
     count: 1
   - value: Uri Blumenthal, IBM
     count: 1
+allrights:
+  - Copyright (c) 1985-1988 Supoj Sutantavibul
+  - Copyright (c) 1991-1999 Micah Beck
+  - Copyright (c) 1989-2002 by Brian V. Smith
+  - Parts Copyright (c) 1991 by Paul King
+  - Parts Copyright (c) 1995 C. Blanc and C. Schlick
+  - Parts Copyright (c) 1993 Anthony Starks
+  - Parts Copyright (c) 1992 Uri Blumenthal, IBM
+  - Parts Copyright (c) 1992 by Brian Boyter
+  - Parts Copyright (c) 1995 Dane Dwyer
+  - Parts Copyright (c) 1999 by Philippe Bekaert
+  - Parts Copyright (c) 1999 by T. Sato
+  - Parts Copyright (c) 1998 by Mike Markowski
+  - Parts Copyright (c) 1994-2002 by Thomas Merz
+  - Parts Copyright (c) 2002-2006 by Martin Kroeker
+  - Copyright 1990, David Koblas.
+  - Copyright, 1987, Massachusetts Institute of Technology
+  - Copyright (c) 2006 Michael Pfeiffer - p3fff@web.de
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/treetablemodeladapter_java-TreeTableModelAdapter_java.java.yml b/tests/cluecode/data/copyrights/treetablemodeladapter_java-TreeTableModelAdapter_java.java.yml
index e82cf9043f..16b701e6a0 100644
--- a/tests/cluecode/data/copyrights/treetablemodeladapter_java-TreeTableModelAdapter_java.java.yml
+++ b/tests/cluecode/data/copyrights/treetablemodeladapter_java-TreeTableModelAdapter_java.java.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
     count: 1
+allrights:
+  - Copyright 1997, 1998 by Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, California, 94303, U.S.A. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/unicode_translit.txt.yml b/tests/cluecode/data/copyrights/unicode_translit.txt.yml
index 07aaf7d05a..370f97fcd1 100644
--- a/tests/cluecode/data/copyrights/unicode_translit.txt.yml
+++ b/tests/cluecode/data/copyrights/unicode_translit.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Wojciech Mula
     count: 1
+allrights:
+  - Copyright (c) 2011-2016 Wojciech Mula All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/unicol.txt.yml b/tests/cluecode/data/copyrights/unicol.txt.yml
index ad39d8d665..82163e37ea 100644
--- a/tests/cluecode/data/copyrights/unicol.txt.yml
+++ b/tests/cluecode/data/copyrights/unicol.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: University College London
     count: 1
+allrights:
+  - Copyright (c) 1998-2000 University College London All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/unpublished.txt.yml b/tests/cluecode/data/copyrights/unpublished.txt.yml
index 3a697e1230..dd13bf9ff4 100644
--- a/tests/cluecode/data/copyrights/unpublished.txt.yml
+++ b/tests/cluecode/data/copyrights/unpublished.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Unpublished Work of Sample Group, Inc.
     count: 1
+allrights:
+  - (c) Unpublished Work of Sample Group, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/uofu_rfpl-UofU_RFPL.yml b/tests/cluecode/data/copyrights/uofu_rfpl-UofU_RFPL.yml
index a72b8c1d6f..f4322d3f73 100644
--- a/tests/cluecode/data/copyrights/uofu_rfpl-UofU_RFPL.yml
+++ b/tests/cluecode/data/copyrights/uofu_rfpl-UofU_RFPL.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: University of Utah
     count: 1
+allrights:
+  - Copyright (c) 2001, 1998 University of Utah. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/url_in_html-detail_9_html.html.yml b/tests/cluecode/data/copyrights/url_in_html-detail_9_html.html.yml
index 433f3ba131..9eae45a080 100644
--- a/tests/cluecode/data/copyrights/url_in_html-detail_9_html.html.yml
+++ b/tests/cluecode/data/copyrights/url_in_html-detail_9_html.html.yml
@@ -9,3 +9,5 @@ expected_failures:
   - copyrights
   - holders
 
+allrights:
+  - (c) Oss http://s.pudn.com/upload_log.asp?e
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/utilities_js-utilities_js.js.yml b/tests/cluecode/data/copyrights/utilities_js-utilities_js.js.yml
index c95bd3285a..66a49f4c26 100644
--- a/tests/cluecode/data/copyrights/utilities_js-utilities_js.js.yml
+++ b/tests/cluecode/data/copyrights/utilities_js-utilities_js.js.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Yahoo! Inc.
     count: 1
+allrights:
+  - Copyright (c) 2009, Yahoo! Inc. All rights reserved.
+  - Copyright 2001 Robert Penner All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/vitess_copyrights.txt.yml b/tests/cluecode/data/copyrights/vitess_copyrights.txt.yml
index b0227a255f..cce2bb5380 100644
--- a/tests/cluecode/data/copyrights/vitess_copyrights.txt.yml
+++ b/tests/cluecode/data/copyrights/vitess_copyrights.txt.yml
@@ -13,3 +13,7 @@ holders:
 holders_summary:
   - value: The Vitess Authors
     count: 3
+allrights:
+  - Copyright 2019 The Vitess Authors.
+  - Copyright 2019 The Vitess Authors
+  - Copyright 2020 The Vitess Authors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/vovida_v1_0-Vovida_v.0.yml b/tests/cluecode/data/copyrights/vovida_v1_0-Vovida_v.0.yml
index c88cf3f8fc..146ca16c06 100644
--- a/tests/cluecode/data/copyrights/vovida_v1_0-Vovida_v.0.yml
+++ b/tests/cluecode/data/copyrights/vovida_v1_0-Vovida_v.0.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Vovida Networks, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2000 Vovida Networks, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/web_app_dtd_b_sun-web_app_dtd.dtd.yml b/tests/cluecode/data/copyrights/web_app_dtd_b_sun-web_app_dtd.dtd.yml
index 4e265f387d..16c758e6b9 100644
--- a/tests/cluecode/data/copyrights/web_app_dtd_b_sun-web_app_dtd.dtd.yml
+++ b/tests/cluecode/data/copyrights/web_app_dtd_b_sun-web_app_dtd.dtd.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Sun Microsystems
     count: 1
+allrights:
+  - Copyright 2000-2007 Sun Microsystems, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/web_app_dtd_sun_twice-web_app_b_dtd.dtd.yml b/tests/cluecode/data/copyrights/web_app_dtd_sun_twice-web_app_b_dtd.dtd.yml
index 0a63969334..a1536bf9a3 100644
--- a/tests/cluecode/data/copyrights/web_app_dtd_sun_twice-web_app_b_dtd.dtd.yml
+++ b/tests/cluecode/data/copyrights/web_app_dtd_sun_twice-web_app_b_dtd.dtd.yml
@@ -14,3 +14,6 @@ holders_summary:
     count: 1
   - value: Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, California 94303, U.S.A.
     count: 1
+allrights:
+  - Copyright (c) 2000 Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, California 94303, U.S.A. All rights reserved.
+  - Copyright (c) 2000 Sun Microsystems, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/weird-date.java.yml b/tests/cluecode/data/copyrights/weird-date.java.yml
index 0c276237ec..7cfd09e3ee 100644
--- a/tests/cluecode/data/copyrights/weird-date.java.yml
+++ b/tests/cluecode/data/copyrights/weird-date.java.yml
@@ -5,3 +5,5 @@ copyrights:
   - Copyright 2010-20224 Amazon.com, Inc. or its affiliates
 holders:
   - Amazon.com, Inc. or its affiliates
+allrights:
+  - Copyright 2010-20224 Amazon.com, Inc. or its affiliates. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/wide_c-c.c.yml b/tests/cluecode/data/copyrights/wide_c-c.c.yml
index 1496c41958..dec39c12bf 100644
--- a/tests/cluecode/data/copyrights/wide_c-c.c.yml
+++ b/tests/cluecode/data/copyrights/wide_c-c.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997, and 1998 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/wide_txt.txt.yml b/tests/cluecode/data/copyrights/wide_txt.txt.yml
index 1496c41958..dec39c12bf 100644
--- a/tests/cluecode/data/copyrights/wide_txt.txt.yml
+++ b/tests/cluecode/data/copyrights/wide_txt.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997, and 1998 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/with_ascii_art.txt.yml b/tests/cluecode/data/copyrights/with_ascii_art.txt.yml
index c809046586..f71fc374a7 100644
--- a/tests/cluecode/data/copyrights/with_ascii_art.txt.yml
+++ b/tests/cluecode/data/copyrights/with_ascii_art.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1996. The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/with_colon.yml b/tests/cluecode/data/copyrights/with_colon.yml
index 377713210e..d3da54ab57 100644
--- a/tests/cluecode/data/copyrights/with_colon.yml
+++ b/tests/cluecode/data/copyrights/with_colon.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Armin Ronacher
     count: 1
+allrights:
+  - copyright (c) 2013 by Armin Ronacher.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/with_dash_and_dotted_name.txt.yml b/tests/cluecode/data/copyrights/with_dash_and_dotted_name.txt.yml
index 536b626cec..f1332d836c 100644
--- a/tests/cluecode/data/copyrights/with_dash_and_dotted_name.txt.yml
+++ b/tests/cluecode/data/copyrights/with_dash_and_dotted_name.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: D.T.Shield
     count: 1
+allrights:
+  - Copyright 1999, 2000 - D.T.Shield.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/with_leading_date_andtrailing_plus.txt.yml b/tests/cluecode/data/copyrights/with_leading_date_andtrailing_plus.txt.yml
index 672df54a86..725b1363d9 100644
--- a/tests/cluecode/data/copyrights/with_leading_date_andtrailing_plus.txt.yml
+++ b/tests/cluecode/data/copyrights/with_leading_date_andtrailing_plus.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Evgeniy Polyakov
     count: 1
+allrights:
+  - 2004+ Copyright (c) Evgeniy Polyakov <zbr@ioremap.net> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/with_sign_dash_and_dotted_name.txt.yml b/tests/cluecode/data/copyrights/with_sign_dash_and_dotted_name.txt.yml
index 36838c1447..e75eed2f62 100644
--- a/tests/cluecode/data/copyrights/with_sign_dash_and_dotted_name.txt.yml
+++ b/tests/cluecode/data/copyrights/with_sign_dash_and_dotted_name.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: D.T.Shield
     count: 1
+allrights:
+  - Copyright (c) 1999, 2000 - D.T.Shield.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/with_sign_year_noun_junk_auth_noun_and_auth.txt.yml b/tests/cluecode/data/copyrights/with_sign_year_noun_junk_auth_noun_and_auth.txt.yml
index 1bec7188d2..89c9e49bc1 100644
--- a/tests/cluecode/data/copyrights/with_sign_year_noun_junk_auth_noun_and_auth.txt.yml
+++ b/tests/cluecode/data/copyrights/with_sign_year_noun_junk_auth_noun_and_auth.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: the original author or authors
     count: 1
+allrights:
+  - Copyright (c) 2007-2010 the original author or authors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/with_verbatim_lf-verbatim_lf_c.c.yml b/tests/cluecode/data/copyrights/with_verbatim_lf-verbatim_lf_c.c.yml
index 7d0b67b32b..a233dcdfc2 100644
--- a/tests/cluecode/data/copyrights/with_verbatim_lf-verbatim_lf_c.c.yml
+++ b/tests/cluecode/data/copyrights/with_verbatim_lf-verbatim_lf_c.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Colin Percival
     count: 1
+allrights:
+  - Copyright 2003-2005 Colin Percival All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/with_year_noun_junk_auth_noun_and_auth.txt.yml b/tests/cluecode/data/copyrights/with_year_noun_junk_auth_noun_and_auth.txt.yml
index 22f1fcbc6b..f27c83015b 100644
--- a/tests/cluecode/data/copyrights/with_year_noun_junk_auth_noun_and_auth.txt.yml
+++ b/tests/cluecode/data/copyrights/with_year_noun_junk_auth_noun_and_auth.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: the original author or authors
     count: 1
+allrights:
+  - Copyright 2007-2010 the original author or authors.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/with_zoo.txt.yml b/tests/cluecode/data/copyrights/with_zoo.txt.yml
index 89db5d2e57..cf4cd6549f 100644
--- a/tests/cluecode/data/copyrights/with_zoo.txt.yml
+++ b/tests/cluecode/data/copyrights/with_zoo.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Open-RnD Sp. z o.o.
     count: 1
+allrights:
+  - Copyright (c) 2012-2013 Open-RnD Sp. z o.o. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/xfonts_utils-xfonts_utils.copyright.yml b/tests/cluecode/data/copyrights/xfonts_utils-xfonts_utils.copyright.yml
index 462219352b..45b8081308 100644
--- a/tests/cluecode/data/copyrights/xfonts_utils-xfonts_utils.copyright.yml
+++ b/tests/cluecode/data/copyrights/xfonts_utils-xfonts_utils.copyright.yml
@@ -57,3 +57,20 @@ holders_summary:
     count: 1
   - value: Unicode, Inc.
     count: 1
+allrights:
+  - Copyright 1991, 1993, 1998 The Open Group
+  - Copyright 2005 Red Hat, Inc.
+  - Copyright 2005 Red Hat, Inc
+  - Copyright (c) 1991-2003 Unicode, Inc. All Rights reserved.
+  - Copyright (c) 2003 The NetBSD Foundation, Inc. All rights reserved.
+  - Copyright (c) 2006 Martin Husemann.
+  - Copyright (c) 2007 Joerg Sonnenberger. All rights reserved.
+  - Copyright (c) 2002-2008 by Juliusz Chroboczek
+  - Copyright (c) 1987, 1993 The Regents of the University of California. All rights reserved.
+  - Copyright 1993, 1994, 1998 The Open Group
+  - Copyright (c) 2002-2008 by Juliusz Chroboczek
+  - Copyright 1999, 2001, 2002, 2004 Branden Robinson.
+  - Copyright 2006 Steve Langasek.
+  - Copyright 1999, 2001, 2002, 2004 Branden Robinson.
+  - Copyright 1999-2002, 2004 Branden Robinson.
+  - Copyright 2006 Steve Langasek.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/xresprobe-xresprobe.label.yml b/tests/cluecode/data/copyrights/xresprobe-xresprobe.label.yml
index 92e21d5dbb..5e9a3e252d 100644
--- a/tests/cluecode/data/copyrights/xresprobe-xresprobe.label.yml
+++ b/tests/cluecode/data/copyrights/xresprobe-xresprobe.label.yml
@@ -29,3 +29,10 @@ holders_summary:
     count: 1
   - value: Terra Soft Solutions, Inc.
     count: 1
+allrights:
+  - copyright (c) 2004 Canonical Software
+  - Copyright (c) 2002 Terra Soft Solutions, Inc.
+  - Copyright (c) 1998 by Josh Vanderhoof
+  - Copyright (c) 1996-1999 SciTech Software, Inc.
+  - copyright (c) David Mosberger-Tang
+  - Copyright (c) 1999 Egbert Eich.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/zend-Zend.yml b/tests/cluecode/data/copyrights/zend-Zend.yml
index 4f266e0645..93e8db112a 100644
--- a/tests/cluecode/data/copyrights/zend-Zend.yml
+++ b/tests/cluecode/data/copyrights/zend-Zend.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Zend Technologies Ltd.
     count: 1
+allrights:
+  - Copyright (c) 1999-2002 Zend Technologies Ltd. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/zope_v1_0-Zope_v.0.yml b/tests/cluecode/data/copyrights/zope_v1_0-Zope_v.0.yml
index 4989e10d6e..fe0ef9859c 100644
--- a/tests/cluecode/data/copyrights/zope_v1_0-Zope_v.0.yml
+++ b/tests/cluecode/data/copyrights/zope_v1_0-Zope_v.0.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Digital Creations
     count: 1
+allrights:
+  - Copyright (c) Digital Creations. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/copyrights/zope_v2_0-Zope_v.0.yml b/tests/cluecode/data/copyrights/zope_v2_0-Zope_v.0.yml
index 240768857b..6e43f30dbc 100644
--- a/tests/cluecode/data/copyrights/zope_v2_0-Zope_v.0.yml
+++ b/tests/cluecode/data/copyrights/zope_v2_0-Zope_v.0.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Zope Corporation (tm) and Contributors
     count: 1
+allrights:
+  - Copyright (c) Zope Corporation (tm) and Contributors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_10.txt.yml b/tests/cluecode/data/generated/copyright_10.txt.yml
index 44e20c6897..cc8b45f821 100644
--- a/tests/cluecode/data/generated/copyright_10.txt.yml
+++ b/tests/cluecode/data/generated/copyright_10.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) by Leh. www.leh.jp
 holders:
   - Leh
+allrights:
+  - Copyright (c) All Rights Reserved by Leh. www.leh.jp
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_11.txt.yml b/tests/cluecode/data/generated/copyright_11.txt.yml
index c1c65157d9..5f7662f322 100644
--- a/tests/cluecode/data/generated/copyright_11.txt.yml
+++ b/tests/cluecode/data/generated/copyright_11.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2014-2019 New Avenue Foundation
 holders:
   - New Avenue Foundation
+allrights:
+  - Copyright (c) All Rights Reserved 2014-2019 New Avenue Foundation.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_12.txt.yml b/tests/cluecode/data/generated/copyright_12.txt.yml
index bb0ae899dc..2646bba463 100644
--- a/tests/cluecode/data/generated/copyright_12.txt.yml
+++ b/tests/cluecode/data/generated/copyright_12.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) - - PROAIM Medical
 holders:
   - PROAIM Medical
+allrights:
+  - Copyright (c) - All Rights Reserved - PROAIM Medical.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_14.txt.yml b/tests/cluecode/data/generated/copyright_14.txt.yml
index a5caca62d9..ae09655a2b 100644
--- a/tests/cluecode/data/generated/copyright_14.txt.yml
+++ b/tests/cluecode/data/generated/copyright_14.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) Lei Connection Inc.
 holders:
   - Lei Connection Inc.
+allrights:
+  - Copyright (c) All Rights Reserved, Lei Connection Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_15.txt.yml b/tests/cluecode/data/generated/copyright_15.txt.yml
index 696a4254b3..ae6e398306 100644
--- a/tests/cluecode/data/generated/copyright_15.txt.yml
+++ b/tests/cluecode/data/generated/copyright_15.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) by Minds, Japan Council for Quality Health Care
 holders:
   - Minds, Japan Council for Quality Health Care
+allrights:
+  - Copyright (c) All rights reserved by Minds, Japan Council for Quality Health Care.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_16.txt.yml b/tests/cluecode/data/generated/copyright_16.txt.yml
index 82107215d3..e30b60820e 100644
--- a/tests/cluecode/data/generated/copyright_16.txt.yml
+++ b/tests/cluecode/data/generated/copyright_16.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) by Chinese Service Center for Scholarly Exchange
 holders:
   - Chinese Service Center for Scholarly Exchange
+allrights:
+  - Copyright (c) All Rights Reserved by Chinese Service Center for Scholarly Exchange
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_17.txt.yml b/tests/cluecode/data/generated/copyright_17.txt.yml
index 74f0b0a2bc..d0f329432a 100644
--- a/tests/cluecode/data/generated/copyright_17.txt.yml
+++ b/tests/cluecode/data/generated/copyright_17.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) Chungjungwon Iotacoffee.Com 2011
 holders:
   - Chungjungwon Iotacoffee.Com
+allrights:
+  - Copyright (c) All Rights Are Reserved. Chungjungwon Iotacoffee.Com 2011
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_18.txt.yml b/tests/cluecode/data/generated/copyright_18.txt.yml
index c037b3c83a..b87fdbaede 100644
--- a/tests/cluecode/data/generated/copyright_18.txt.yml
+++ b/tests/cluecode/data/generated/copyright_18.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - South Baylo University Copyright (c)
 holders:
   - South Baylo University
+allrights:
+  - South Baylo University Copyright (c) All Right Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_19.txt.yml b/tests/cluecode/data/generated/copyright_19.txt.yml
index 6babfb07c4..a8227696aa 100644
--- a/tests/cluecode/data/generated/copyright_19.txt.yml
+++ b/tests/cluecode/data/generated/copyright_19.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - http://www.enox.biz/ Copyright (c) by Zhu Shi Hui She
 holders:
   - Zhu Shi Hui She
+allrights:
+  - http://www.enox.biz/ Copyright (c) All rights Reserved by Zhu Shi Hui She
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_2.txt.yml b/tests/cluecode/data/generated/copyright_2.txt.yml
index 611a0c9b4a..7ce8212c6d 100644
--- a/tests/cluecode/data/generated/copyright_2.txt.yml
+++ b/tests/cluecode/data/generated/copyright_2.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) SSC. Ltd.
 holders:
   - SSC. Ltd.
+allrights:
+  - Copyright (c) All right reserved SSC. Ltd.
diff --git a/tests/cluecode/data/generated/copyright_20.txt.yml b/tests/cluecode/data/generated/copyright_20.txt.yml
index fe0c90e215..99bb778e49 100644
--- a/tests/cluecode/data/generated/copyright_20.txt.yml
+++ b/tests/cluecode/data/generated/copyright_20.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) by Zhu Shi Hui She Zhao Ri Zhu Zhai She
 holders:
   - Zhu Shi Hui She Zhao Ri Zhu Zhai She
+allrights:
+  - Copyright (c) All rights Reserved by Zhu Shi Hui She Zhao Ri Zhu Zhai She
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_21.txt.yml b/tests/cluecode/data/generated/copyright_21.txt.yml
index 97a90ab975..e11dfaee32 100644
--- a/tests/cluecode/data/generated/copyright_21.txt.yml
+++ b/tests/cluecode/data/generated/copyright_21.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - copyright (c) localism,Inc.
 holders:
   - localism,Inc.
+allrights:
+  - copyright (c) All rights reserved localism,Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_23.txt.yml b/tests/cluecode/data/generated/copyright_23.txt.yml
index 2368d67b20..4460cf16b2 100644
--- a/tests/cluecode/data/generated/copyright_23.txt.yml
+++ b/tests/cluecode/data/generated/copyright_23.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Iotacoffee.Com 2011 Copyright (c)
 holders:
   - Iotacoffee.Com
+allrights:
+  - Iotacoffee.Com 2011 Copyright (c) All Rights Are Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_25.txt.yml b/tests/cluecode/data/generated/copyright_25.txt.yml
index f1c25da6cd..d7aa9b26dc 100644
--- a/tests/cluecode/data/generated/copyright_25.txt.yml
+++ b/tests/cluecode/data/generated/copyright_25.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) Hair Plus Trading Co., Inc.
 holders:
   - Hair Plus Trading Co., Inc.
+allrights:
+  - Copyright (c) All Rights Reserved. Hair Plus Trading Co., Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_26.txt.yml b/tests/cluecode/data/generated/copyright_26.txt.yml
index 3e314ca0a5..ea00368458 100644
--- a/tests/cluecode/data/generated/copyright_26.txt.yml
+++ b/tests/cluecode/data/generated/copyright_26.txt.yml
@@ -7,3 +7,5 @@ copyrights:
 holders:
   - 2007-2020Ban Quan Suo
 notes: we do not split year from Chinese name correctly.
+allrights:
+  - Copyright (c) All Rights Reserved 2007-2020Ban Quan Suo
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_29.txt.yml b/tests/cluecode/data/generated/copyright_29.txt.yml
index 91097ae45e..2008f3a6ec 100644
--- a/tests/cluecode/data/generated/copyright_29.txt.yml
+++ b/tests/cluecode/data/generated/copyright_29.txt.yml
@@ -11,3 +11,5 @@ expected_failures:
   - copyrights
   - authors
 
+allrights:
+  - Created by Samvel Khalatyan, May 28, 2013 Copyright 2013, All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_3.txt.yml b/tests/cluecode/data/generated/copyright_3.txt.yml
index f5b9d40db8..cd5a744602 100644
--- a/tests/cluecode/data/generated/copyright_3.txt.yml
+++ b/tests/cluecode/data/generated/copyright_3.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Crown Copyright C
 holders:
   - Crown
+allrights:
+  - Crown Copyright C All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_31.txt.yml b/tests/cluecode/data/generated/copyright_31.txt.yml
index b1ce3ed331..516277462a 100644
--- a/tests/cluecode/data/generated/copyright_31.txt.yml
+++ b/tests/cluecode/data/generated/copyright_31.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - (c) Copyright CNRI
 holders:
   - CNRI
+allrights:
+  - (c) Copyright CNRI, All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_32.txt.yml b/tests/cluecode/data/generated/copyright_32.txt.yml
index 46ef38baf5..13123acc44 100644
--- a/tests/cluecode/data/generated/copyright_32.txt.yml
+++ b/tests/cluecode/data/generated/copyright_32.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright michimani
 holders:
   - michimani
+allrights:
+  - Copyright michimani All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_33.txt.yml b/tests/cluecode/data/generated/copyright_33.txt.yml
index 61b69b1303..c1ade42572 100644
--- a/tests/cluecode/data/generated/copyright_33.txt.yml
+++ b/tests/cluecode/data/generated/copyright_33.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright 2019
 authors:
   - Pine <cdtsgsz@gmail.com>
+allrights:
+  - Copyright 2019, All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_34.txt.yml b/tests/cluecode/data/generated/copyright_34.txt.yml
index 38cc302fe8..d5e4c1a3fb 100644
--- a/tests/cluecode/data/generated/copyright_34.txt.yml
+++ b/tests/cluecode/data/generated/copyright_34.txt.yml
@@ -9,3 +9,5 @@ copyrights:
 expected_failures:
   - authors
 
+allrights:
+  - Copyright 2011 All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_35.txt.yml b/tests/cluecode/data/generated/copyright_35.txt.yml
index 2188884b4c..98ca23457d 100644
--- a/tests/cluecode/data/generated/copyright_35.txt.yml
+++ b/tests/cluecode/data/generated/copyright_35.txt.yml
@@ -9,3 +9,5 @@ copyrights:
 expected_failures:
   - authors
 
+allrights:
+  - Copyright 2010. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_36.txt.yml b/tests/cluecode/data/generated/copyright_36.txt.yml
index ee8ce0704a..db2acd01fb 100644
--- a/tests/cluecode/data/generated/copyright_36.txt.yml
+++ b/tests/cluecode/data/generated/copyright_36.txt.yml
@@ -4,3 +4,5 @@ what:
   - authors
 copyrights:
   - Copyright 2016
+allrights:
+  - Copyright 2016, All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_38.txt.yml b/tests/cluecode/data/generated/copyright_38.txt.yml
index ee7b98212a..11a4934fb1 100644
--- a/tests/cluecode/data/generated/copyright_38.txt.yml
+++ b/tests/cluecode/data/generated/copyright_38.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) All the Raige Dog Salon
 holders:
   - All the Raige Dog Salon
+allrights:
+  - Copyright (c) All the Raige Dog Salon. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_41.txt.yml b/tests/cluecode/data/generated/copyright_41.txt.yml
index 1002d7f249..a6fab1a7a0 100644
--- a/tests/cluecode/data/generated/copyright_41.txt.yml
+++ b/tests/cluecode/data/generated/copyright_41.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) Joe Joyce and contributors, 2016-2019
 holders:
   - Joe Joyce and contributors
+allrights:
+  - Copyright (c) Joe Joyce and contributors, 2016-2019.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_45.txt.yml b/tests/cluecode/data/generated/copyright_45.txt.yml
index 4d6b41a219..bfe05beeef 100644
--- a/tests/cluecode/data/generated/copyright_45.txt.yml
+++ b/tests/cluecode/data/generated/copyright_45.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) 2013, OpenCV Foundation
 holders:
   - OpenCV Foundation
+allrights:
+  - Copyright (c) 2013, OpenCV Foundation, all rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_46.txt.yml b/tests/cluecode/data/generated/copyright_46.txt.yml
index fb7aeef775..f59cbb089e 100644
--- a/tests/cluecode/data/generated/copyright_46.txt.yml
+++ b/tests/cluecode/data/generated/copyright_46.txt.yml
@@ -8,3 +8,6 @@ copyrights:
 holders:
   - The Regents of the University of California (Regents)
   - the respective contributors
+allrights:
+  - Copyright (c) 2014, 2015, The Regents of the University of California (Regents) All rights reserved.
+  - Copyright (c) 2014, 2015, the respective contributors All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_47.txt.yml b/tests/cluecode/data/generated/copyright_47.txt.yml
index de368553a5..b029d61ce3 100644
--- a/tests/cluecode/data/generated/copyright_47.txt.yml
+++ b/tests/cluecode/data/generated/copyright_47.txt.yml
@@ -4,3 +4,5 @@ what:
   - authors
 copyrights:
   - Copyright 2011
+allrights:
+  - Copyright 2011. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_48.txt.yml b/tests/cluecode/data/generated/copyright_48.txt.yml
index f6dfc418e5..f5fabfe5ec 100644
--- a/tests/cluecode/data/generated/copyright_48.txt.yml
+++ b/tests/cluecode/data/generated/copyright_48.txt.yml
@@ -4,3 +4,5 @@ what:
   - authors
 copyrights:
   - Copyright 2012
+allrights:
+  - Copyright 2012. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_51.txt.yml b/tests/cluecode/data/generated/copyright_51.txt.yml
index f6dfc418e5..f5fabfe5ec 100644
--- a/tests/cluecode/data/generated/copyright_51.txt.yml
+++ b/tests/cluecode/data/generated/copyright_51.txt.yml
@@ -4,3 +4,5 @@ what:
   - authors
 copyrights:
   - Copyright 2012
+allrights:
+  - Copyright 2012. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_52.txt.yml b/tests/cluecode/data/generated/copyright_52.txt.yml
index 7e4d25b160..205c969c38 100644
--- a/tests/cluecode/data/generated/copyright_52.txt.yml
+++ b/tests/cluecode/data/generated/copyright_52.txt.yml
@@ -8,3 +8,6 @@ copyrights:
 holders:
   - The Regents of the University of California (Regents)
   - the respective contributors
+allrights:
+  - Copyright (c) 2014, The Regents of the University of California (Regents) All rights reserved.
+  - Copyright (c) 2014, the respective contributors All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_6.txt.yml b/tests/cluecode/data/generated/copyright_6.txt.yml
index cc43354f00..5da7290bc6 100644
--- a/tests/cluecode/data/generated/copyright_6.txt.yml
+++ b/tests/cluecode/data/generated/copyright_6.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - copyright (c) istyle Inc.
 holders:
   - istyle Inc.
+allrights:
+  - copyright (c) All rights reserved istyle Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_7.txt.yml b/tests/cluecode/data/generated/copyright_7.txt.yml
index 00016d26d1..64aca28f94 100644
--- a/tests/cluecode/data/generated/copyright_7.txt.yml
+++ b/tests/cluecode/data/generated/copyright_7.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - Copyright (c) by the District Export Council of Georgia
 holders:
   - the District Export Council of Georgia
+allrights:
+  - Copyright (c) All Rights Reserved by the District Export Council of Georgia.
\ No newline at end of file
diff --git a/tests/cluecode/data/generated/copyright_9.txt.yml b/tests/cluecode/data/generated/copyright_9.txt.yml
index a928bbf362..d5553d85de 100644
--- a/tests/cluecode/data/generated/copyright_9.txt.yml
+++ b/tests/cluecode/data/generated/copyright_9.txt.yml
@@ -6,3 +6,5 @@ copyrights:
   - COPYRIGHT (c) All About, Inc.
 holders:
   - All About, Inc.
+allrights:
+  - COPYRIGHT (c) All About, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/germany_should_detect_trailing_city_in_holders.txt.yml b/tests/cluecode/data/holders/germany_should_detect_trailing_city_in_holders.txt.yml
index d9073e1f18..41b885b359 100644
--- a/tests/cluecode/data/holders/germany_should_detect_trailing_city_in_holders.txt.yml
+++ b/tests/cluecode/data/holders/germany_should_detect_trailing_city_in_holders.txt.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: Bardenheuer GmbH, Munich and Bundesdruckerei GmbH, Berlin
     count: 1
+allrights:
+  - Copyright (c) 2011 Bardenheuer GmbH, Munich and Bundesdruckerei GmbH, Berlin
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_acme_c-c.c.yml b/tests/cluecode/data/holders/holder_acme_c-c.c.yml
index af8c0f095f..17a4ddfd82 100644
--- a/tests/cluecode/data/holders/holder_acme_c-c.c.yml
+++ b/tests/cluecode/data/holders/holder_acme_c-c.c.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: ACME, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2000 ACME, Inc., All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_addr_c-addr_c.c.yml b/tests/cluecode/data/holders/holder_addr_c-addr_c.c.yml
index 0786f3d679..1016d69bf1 100644
--- a/tests/cluecode/data/holders/holder_addr_c-addr_c.c.yml
+++ b/tests/cluecode/data/holders/holder_addr_c-addr_c.c.yml
@@ -9,3 +9,6 @@ holders_summary:
     count: 1
   - value: Jon Doe
     count: 1
+allrights:
+  - Copyright 1999 Cornell University. All rights reserved.
+  - Copyright 2000 Jon Doe. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_atheros_py-py.py.yml b/tests/cluecode/data/holders/holder_atheros_py-py.py.yml
index 02387c9697..e007ee082e 100644
--- a/tests/cluecode/data/holders/holder_atheros_py-py.py.yml
+++ b/tests/cluecode/data/holders/holder_atheros_py-py.py.yml
@@ -10,3 +10,7 @@ holders_summary:
     count: 2
   - value: Intel Corporation
     count: 1
+allrights:
+  - Copyright (c) 2000 Atheros Communications, Inc., All Rights Reserved
+  - Copyright (c) 2001 Atheros Communications, Inc., All Rights Reserved
+  - Copyright (c) 1994-1997 by Intel Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_audio_c-c.c.yml b/tests/cluecode/data/holders/holder_audio_c-c.c.yml
index f52dd4cf51..6b8bb28c16 100644
--- a/tests/cluecode/data/holders/holder_audio_c-c.c.yml
+++ b/tests/cluecode/data/holders/holder_audio_c-c.c.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: AudioCodes, DSP Group, France Telecom, Universite de Sherbrooke
     count: 1
+allrights:
+  - copyright (c) 1995, AudioCodes, DSP Group, France Telecom, Universite de Sherbrooke. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_basic-copy_c.c.yml b/tests/cluecode/data/holders/holder_basic-copy_c.c.yml
index e08b4db2d1..e47f1d5571 100644
--- a/tests/cluecode/data/holders/holder_basic-copy_c.c.yml
+++ b/tests/cluecode/data/holders/holder_basic-copy_c.c.yml
@@ -19,3 +19,18 @@ holders:
 holders_summary:
   - value: Markus Franz Xaver Johannes Oberhumer
     count: 14
+allrights:
+  - Copyright (c) 2008 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 2007 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 2006 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 2005 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 2004 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 2003 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 2002 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 2001 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 2000 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 1999 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 1998 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 1997 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 1996 Markus Franz Xaver Johannes Oberhumer All Rights Reserved.
+  - (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Markus Franz Xaver Johannes Oberhumer <markus@oberhumer.com> http://www.oberhumer.com
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_complex-strtol_c.c.yml b/tests/cluecode/data/holders/holder_complex-strtol_c.c.yml
index 9b03b2af24..d3b9f6bbd7 100644
--- a/tests/cluecode/data/holders/holder_complex-strtol_c.c.yml
+++ b/tests/cluecode/data/holders/holder_complex-strtol_c.c.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1990 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_hans_jurgen_html-9_html.html.yml b/tests/cluecode/data/holders/holder_hans_jurgen_html-9_html.html.yml
index f647501919..067b921dfe 100644
--- a/tests/cluecode/data/holders/holder_hans_jurgen_html-9_html.html.yml
+++ b/tests/cluecode/data/holders/holder_hans_jurgen_html-9_html.html.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: Hans-Jurgen Koch
     count: 1
+allrights:
+  - Copyright (c) 2006 by Hans-Jurgen Koch.
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_hostpad-hostapd_cli_c.c.yml b/tests/cluecode/data/holders/holder_hostpad-hostapd_cli_c.c.yml
index 64aac13b41..35485cdf7d 100644
--- a/tests/cluecode/data/holders/holder_hostpad-hostapd_cli_c.c.yml
+++ b/tests/cluecode/data/holders/holder_hostpad-hostapd_cli_c.c.yml
@@ -9,3 +9,6 @@ holders_summary:
     count: 1
   - value: Jouni Malinen and contributors
     count: 1
+allrights:
+  - Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.fi>
+  - Copyright (c) 2004-2005, Jouni Malinen <jkmaline@cc.hut.fi> and contributors
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_ibm_c-ibm_c.c.yml b/tests/cluecode/data/holders/holder_ibm_c-ibm_c.c.yml
index 5b131903d0..169a431bcb 100644
--- a/tests/cluecode/data/holders/holder_ibm_c-ibm_c.c.yml
+++ b/tests/cluecode/data/holders/holder_ibm_c-ibm_c.c.yml
@@ -19,3 +19,10 @@ holders_summary:
     count: 1
   - value: ibm.com
     count: 1
+allrights:
+  - Copyright (c) ibm technologies 2008
+  - Copyright (c) IBM Corporation 2008
+  - Copyright (c) Ibm Corp. 2008
+  - Copyright (c) ibm.com 2008
+  - Copyright (c) IBM technology 2008
+  - Copyright (c) IBM company 2008
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_ifrename-ifrename_c.c.yml b/tests/cluecode/data/holders/holder_ifrename-ifrename_c.c.yml
index 18ab0afaf6..751381dc4e 100644
--- a/tests/cluecode/data/holders/holder_ifrename-ifrename_c.c.yml
+++ b/tests/cluecode/data/holders/holder_ifrename-ifrename_c.c.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: Jean Tourrilhes
     count: 1
+allrights:
+  - Copyright (c) 2004 Jean Tourrilhes <jt@hpl.hp.com>
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_in_c-c.c.yml b/tests/cluecode/data/holders/holder_in_c-c.c.yml
index f5090a98c0..e600fa1d03 100644
--- a/tests/cluecode/data/holders/holder_in_c-c.c.yml
+++ b/tests/cluecode/data/holders/holder_in_c-c.c.yml
@@ -15,3 +15,14 @@ holders:
 holders_summary:
   - value: Markus Franz Xaver Johannes Oberhumer
     count: 10
+allrights:
+  - Copyright (c) 2005 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 2004 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 2003 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 2002 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 2001 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 2000 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 1999 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 1998 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 1997 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 1996 Markus Franz Xaver Johannes Oberhumer
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_in_copyright-COPYRIGHT_madwifi.madwifi.yml b/tests/cluecode/data/holders/holder_in_copyright-COPYRIGHT_madwifi.madwifi.yml
index 42b41df3ed..c23df44aa9 100644
--- a/tests/cluecode/data/holders/holder_in_copyright-COPYRIGHT_madwifi.madwifi.yml
+++ b/tests/cluecode/data/holders/holder_in_copyright-COPYRIGHT_madwifi.madwifi.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: Sam Leffler, Errno Consulting, Atheros Communications, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros Communications, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_in_h-ah_h.h.yml b/tests/cluecode/data/holders/holder_in_h-ah_h.h.yml
index 42b41df3ed..c23df44aa9 100644
--- a/tests/cluecode/data/holders/holder_in_h-ah_h.h.yml
+++ b/tests/cluecode/data/holders/holder_in_h-ah_h.h.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: Sam Leffler, Errno Consulting, Atheros Communications, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros Communications, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_in_license-COPYING_gpl.gpl.yml b/tests/cluecode/data/holders/holder_in_license-COPYING_gpl.gpl.yml
index 9ecae8374c..f8be9d8448 100644
--- a/tests/cluecode/data/holders/holder_in_license-COPYING_gpl.gpl.yml
+++ b/tests/cluecode/data/holders/holder_in_license-COPYING_gpl.gpl.yml
@@ -7,3 +7,6 @@ holders:
 holders_summary:
   - value: Free Software Foundation
     count: 2
+allrights:
+  - Copyright (c) 1989, 1991 Free Software Foundation, Inc.
+  - copyrighted by the Free Software Foundation
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_in_readme-README.yml b/tests/cluecode/data/holders/holder_in_readme-README.yml
index 5c10746370..be902b8cf8 100644
--- a/tests/cluecode/data/holders/holder_in_readme-README.yml
+++ b/tests/cluecode/data/holders/holder_in_readme-README.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: Jouni Malinen and contributors
     count: 1
+allrights:
+  - Copyright (c) 2002-2006, Jouni Malinen <jkmaline@cc.hut.fi> and contributors All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_in_text_.txt.yml b/tests/cluecode/data/holders/holder_in_text_.txt.yml
index f5090a98c0..e600fa1d03 100644
--- a/tests/cluecode/data/holders/holder_in_text_.txt.yml
+++ b/tests/cluecode/data/holders/holder_in_text_.txt.yml
@@ -15,3 +15,14 @@ holders:
 holders_summary:
   - value: Markus Franz Xaver Johannes Oberhumer
     count: 10
+allrights:
+  - Copyright (c) 2005 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 2004 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 2003 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 2002 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 2001 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 2000 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 1999 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 1998 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 1997 Markus Franz Xaver Johannes Oberhumer
+  - Copyright (c) 1996 Markus Franz Xaver Johannes Oberhumer
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_in_uuencode_binary-mips_be_elf_hal_o_uu.uu.yml b/tests/cluecode/data/holders/holder_in_uuencode_binary-mips_be_elf_hal_o_uu.uu.yml
index 42b41df3ed..c23df44aa9 100644
--- a/tests/cluecode/data/holders/holder_in_uuencode_binary-mips_be_elf_hal_o_uu.uu.yml
+++ b/tests/cluecode/data/holders/holder_in_uuencode_binary-mips_be_elf_hal_o_uu.uu.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: Sam Leffler, Errno Consulting, Atheros Communications, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros Communications, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_javascript-utilities_js.js.yml b/tests/cluecode/data/holders/holder_javascript-utilities_js.js.yml
index ffc375647b..d2ec7c202b 100644
--- a/tests/cluecode/data/holders/holder_javascript-utilities_js.js.yml
+++ b/tests/cluecode/data/holders/holder_javascript-utilities_js.js.yml
@@ -9,3 +9,6 @@ holders_summary:
     count: 1
   - value: Yahoo! Inc.
     count: 1
+allrights:
+  - Copyright (c) 2009, Yahoo! Inc. All rights reserved.
+  - Copyright 2001 Robert Penner All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_javascript_large-ext_all_js.js.yml b/tests/cluecode/data/holders/holder_javascript_large-ext_all_js.js.yml
index 7d0e4b8a9f..683bd419ee 100644
--- a/tests/cluecode/data/holders/holder_javascript_large-ext_all_js.js.yml
+++ b/tests/cluecode/data/holders/holder_javascript_large-ext_all_js.js.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: Ext JS, LLC
     count: 1
+allrights:
+  - Copyright (c) 2006-2009 Ext JS, LLC licensing@extjs.com http://www.extjs.com/license
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_mergesort_java-MergeSort_java.java.yml b/tests/cluecode/data/holders/holder_mergesort_java-MergeSort_java.java.yml
index ee3eb8780b..c9086c7c57 100644
--- a/tests/cluecode/data/holders/holder_mergesort_java-MergeSort_java.java.yml
+++ b/tests/cluecode/data/holders/holder_mergesort_java-MergeSort_java.java.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: Sun Microsystems
     count: 1
+allrights:
+  - Copyright (c) 1998 Sun Microsystems, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_multiline-Historical.txt.yml b/tests/cluecode/data/holders/holder_multiline-Historical.txt.yml
index 2b6dfdf694..a713423bd8 100644
--- a/tests/cluecode/data/holders/holder_multiline-Historical.txt.yml
+++ b/tests/cluecode/data/holders/holder_multiline-Historical.txt.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: GEORGE J. CARRETTE, CONCORD, MASSACHUSETTS.
     count: 1
+allrights:
+  - COPYRIGHT (c) 1990-1994 BY GEORGE J. CARRETTE, CONCORD, MASSACHUSETTS. ALL RIGHTS RESERVED
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_nokia_cpp-cpp.cpp.yml b/tests/cluecode/data/holders/holder_nokia_cpp-cpp.cpp.yml
index 4e1ea58989..cc15cd77e8 100644
--- a/tests/cluecode/data/holders/holder_nokia_cpp-cpp.cpp.yml
+++ b/tests/cluecode/data/holders/holder_nokia_cpp-cpp.cpp.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: Nokia Mobile Phones
     count: 1
+allrights:
+  - Copyright (c) 2002, Nokia Mobile Phones. All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_sample_java-java.java.yml b/tests/cluecode/data/holders/holder_sample_java-java.java.yml
index b462484779..54c2a60446 100644
--- a/tests/cluecode/data/holders/holder_sample_java-java.java.yml
+++ b/tests/cluecode/data/holders/holder_sample_java-java.java.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: Sample ABC Inc.
     count: 1
+allrights:
+  - Copyright (c) 2000-2007, Sample ABC Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_simple-copy_c.c.yml b/tests/cluecode/data/holders/holder_simple-copy_c.c.yml
index 4da86d3504..856a17834d 100644
--- a/tests/cluecode/data/holders/holder_simple-copy_c.c.yml
+++ b/tests/cluecode/data/holders/holder_simple-copy_c.c.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: Markus Franz Xaver Johannes Oberhumer
     count: 1
+allrights:
+  - Copyright (c) 1996 Markus Franz Xaver Johannes Oberhumer
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_snmptrapd_c-snmptrapd_c.c.yml b/tests/cluecode/data/holders/holder_snmptrapd_c-snmptrapd_c.c.yml
index 5565ce8685..5866f6fff5 100644
--- a/tests/cluecode/data/holders/holder_snmptrapd_c-snmptrapd_c.c.yml
+++ b/tests/cluecode/data/holders/holder_snmptrapd_c-snmptrapd_c.c.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: Carnegie Mellon University
     count: 1
+allrights:
+  - Copyright 1989, 1991, 1992 by Carnegie Mellon University
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_somefile_cpp-somefile_cpp.cpp.yml b/tests/cluecode/data/holders/holder_somefile_cpp-somefile_cpp.cpp.yml
index 67d7fb6b87..8e9fa86094 100644
--- a/tests/cluecode/data/holders/holder_somefile_cpp-somefile_cpp.cpp.yml
+++ b/tests/cluecode/data/holders/holder_somefile_cpp-somefile_cpp.cpp.yml
@@ -15,3 +15,7 @@ holders_summary:
     count: 2
   - value: Foobar Company (PC) Property of Foobar Company
     count: 1
+allrights:
+  - Foobar Company, All Rights Reserved, (c) 2005
+  - Copyright Foobar Company (PC) Property of Foobar Company
+  - Copyright (2003) Foobar Company All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_stacktrace_cpp-stacktrace_cpp.cpp.yml b/tests/cluecode/data/holders/holder_stacktrace_cpp-stacktrace_cpp.cpp.yml
index c1b692265c..20065c5f97 100644
--- a/tests/cluecode/data/holders/holder_stacktrace_cpp-stacktrace_cpp.cpp.yml
+++ b/tests/cluecode/data/holders/holder_stacktrace_cpp-stacktrace_cpp.cpp.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: Rickard E. Faith
     count: 1
+allrights:
+  - Copyright 2003, 2004 Rickard E. Faith (faith@dict.org)
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_super_c-c.c.yml b/tests/cluecode/data/holders/holder_super_c-c.c.yml
index 64355d873a..faae0eaedc 100644
--- a/tests/cluecode/data/holders/holder_super_c-c.c.yml
+++ b/tests/cluecode/data/holders/holder_super_c-c.c.yml
@@ -9,3 +9,6 @@ holders_summary:
     count: 1
   - value: Super Technologies Corporation, Cedar Rapids, Iowa, U.S.A.
     count: 1
+allrights:
+  - Copyright (c) \$LastChangedDate\$ Super Technologies Corporation, Cedar Rapids, Iowa, U.S.A. ALL RIGHTS RESERVED
+  - Copyright (c) 2004 Benjamin Herrenschmuidt (benh@kernel.crashing.org), IBM Corp.
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_treetablemodeladapter_java-TreeTableModelAdapter_java.java.yml b/tests/cluecode/data/holders/holder_treetablemodeladapter_java-TreeTableModelAdapter_java.java.yml
index e82cf9043f..16b701e6a0 100644
--- a/tests/cluecode/data/holders/holder_treetablemodeladapter_java-TreeTableModelAdapter_java.java.yml
+++ b/tests/cluecode/data/holders/holder_treetablemodeladapter_java-TreeTableModelAdapter_java.java.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, California, 94303, U.S.A.
     count: 1
+allrights:
+  - Copyright 1997, 1998 by Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, California, 94303, U.S.A. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_tunnel_h-tunnel_h.h.yml b/tests/cluecode/data/holders/holder_tunnel_h-tunnel_h.h.yml
index c62bfc94a6..dca0d8a2b3 100644
--- a/tests/cluecode/data/holders/holder_tunnel_h-tunnel_h.h.yml
+++ b/tests/cluecode/data/holders/holder_tunnel_h-tunnel_h.h.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: Frank Strauss
     count: 1
+allrights:
+  - Copyright (c) 2000 Frank Strauss <strauss@ibr.cs.tu-bs.de>
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_var_route_c-var_route_c.c.yml b/tests/cluecode/data/holders/holder_var_route_c-var_route_c.c.yml
index 014d3bc158..8928418fe2 100644
--- a/tests/cluecode/data/holders/holder_var_route_c-var_route_c.c.yml
+++ b/tests/cluecode/data/holders/holder_var_route_c-var_route_c.c.yml
@@ -9,3 +9,6 @@ holders_summary:
     count: 1
   - value: TGV, Incorporated
     count: 1
+allrights:
+  - Copyright 1988, 1989 by Carnegie Mellon University
+  - Copyright 1989 TGV, Incorporated
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_xcon_sh-9_sh.sh.yml b/tests/cluecode/data/holders/holder_xcon_sh-9_sh.sh.yml
index 128bcbf147..b50f7b39c7 100644
--- a/tests/cluecode/data/holders/holder_xcon_sh-9_sh.sh.yml
+++ b/tests/cluecode/data/holders/holder_xcon_sh-9_sh.sh.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: X Consortium
     count: 1
+allrights:
+  - Copyright (c) 1994 X Consortium
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/holder_young_c-c.c.yml b/tests/cluecode/data/holders/holder_young_c-c.c.yml
index d7dd8fef68..e8bd0d1230 100644
--- a/tests/cluecode/data/holders/holder_young_c-c.c.yml
+++ b/tests/cluecode/data/holders/holder_young_c-c.c.yml
@@ -9,3 +9,6 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1997 Eric Young (eay@mincom.oz.au) All rights reserved.
+  - holder is Tim Hudson (tjh@mincom.oz.au).
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/ibm_and_authors_are_detected_holders.txt.yml b/tests/cluecode/data/holders/ibm_and_authors_are_detected_holders.txt.yml
index 904db16f7c..f434dae827 100644
--- a/tests/cluecode/data/holders/ibm_and_authors_are_detected_holders.txt.yml
+++ b/tests/cluecode/data/holders/ibm_and_authors_are_detected_holders.txt.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: IBM, Corp.
     count: 1
+allrights:
+  - Copyright IBM, Corp. 2007
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/man_page_holders.txt.yml b/tests/cluecode/data/holders/man_page_holders.txt.yml
index b59ac8dce3..48a51da562 100644
--- a/tests/cluecode/data/holders/man_page_holders.txt.yml
+++ b/tests/cluecode/data/holders/man_page_holders.txt.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: Free Software Foundation, Inc., and others
     count: 1
+allrights:
+  - Copyright 2001-2017 Free Software Foundation, Inc., and others.
\ No newline at end of file
diff --git a/tests/cluecode/data/holders/oracle.txt.yml b/tests/cluecode/data/holders/oracle.txt.yml
index c4ba2aef8e..176f84b705 100644
--- a/tests/cluecode/data/holders/oracle.txt.yml
+++ b/tests/cluecode/data/holders/oracle.txt.yml
@@ -6,3 +6,5 @@ holders:
 holders_summary:
   - value: Oracle and/or its affiliates
     count: 1
+allrights:
+  - Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/android-mock-src-com-google-android-testing-mocking/GeneratedMockJar.readme.yml b/tests/cluecode/data/ics/android-mock-src-com-google-android-testing-mocking/GeneratedMockJar.readme.yml
index fd28a94506..9c653dcd8e 100644
--- a/tests/cluecode/data/ics/android-mock-src-com-google-android-testing-mocking/GeneratedMockJar.readme.yml
+++ b/tests/cluecode/data/ics/android-mock-src-com-google-android-testing-mocking/GeneratedMockJar.readme.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2010 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/android-mock/regenerate_from_source.sh.yml b/tests/cluecode/data/ics/android-mock/regenerate_from_source.sh.yml
index 98e267d0fe..adfc8dd4fe 100644
--- a/tests/cluecode/data/ics/android-mock/regenerate_from_source.sh.yml
+++ b/tests/cluecode/data/ics/android-mock/regenerate_from_source.sh.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Android Open Source Project
     count: 1
+allrights:
+  - Copyright (c) 2011 The Android Open Source Project.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/antlr-src-org-antlr-runtime/ANTLRFileStream.java.yml b/tests/cluecode/data/ics/antlr-src-org-antlr-runtime/ANTLRFileStream.java.yml
index d801e23a27..5408a5fef0 100644
--- a/tests/cluecode/data/ics/antlr-src-org-antlr-runtime/ANTLRFileStream.java.yml
+++ b/tests/cluecode/data/ics/antlr-src-org-antlr-runtime/ANTLRFileStream.java.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Terence Parr
     count: 1
+allrights:
+  - Copyright (c) 2005-2009 Terence Parr All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/apache-harmony/NOTICE.yml b/tests/cluecode/data/ics/apache-harmony/NOTICE.yml
index 1b58081203..b09d8c4b1b 100644
--- a/tests/cluecode/data/ics/apache-harmony/NOTICE.yml
+++ b/tests/cluecode/data/ics/apache-harmony/NOTICE.yml
@@ -15,3 +15,8 @@ holders:
 holders_summary:
   - value: The Apache Software Foundation
     count: 4
+allrights:
+  - Copyright 2001-2004 The Apache Software Foundation.
+  - Copyright 2001-2006 The Apache Software Foundation.
+  - Copyright 2003-2004 The Apache Software Foundation.
+  - Copyright 2004 The Apache Software Foundation.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/apache-http-src-org-apache-commons-codec/BinaryDecoder.java.yml b/tests/cluecode/data/ics/apache-http-src-org-apache-commons-codec/BinaryDecoder.java.yml
index 1c7a1982ff..c85ef55753 100644
--- a/tests/cluecode/data/ics/apache-http-src-org-apache-commons-codec/BinaryDecoder.java.yml
+++ b/tests/cluecode/data/ics/apache-http-src-org-apache-commons-codec/BinaryDecoder.java.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Apache Software Foundation
     count: 1
+allrights:
+  - Copyright 2001-2004 The Apache Software Foundation.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/apache-http-src-org-apache-commons-codec/overview.html.yml b/tests/cluecode/data/ics/apache-http-src-org-apache-commons-codec/overview.html.yml
index 6179e209d1..9fe001d9f9 100644
--- a/tests/cluecode/data/ics/apache-http-src-org-apache-commons-codec/overview.html.yml
+++ b/tests/cluecode/data/ics/apache-http-src-org-apache-commons-codec/overview.html.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Apache Software Foundation
     count: 1
+allrights:
+  - Copyright 2003-2004 The Apache Software Foundation.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/apache-http-src-org-apache-commons-logging-impl/WeakHashtable.java.yml b/tests/cluecode/data/ics/apache-http-src-org-apache-commons-logging-impl/WeakHashtable.java.yml
index b66499dfdc..469dbeec6b 100644
--- a/tests/cluecode/data/ics/apache-http-src-org-apache-commons-logging-impl/WeakHashtable.java.yml
+++ b/tests/cluecode/data/ics/apache-http-src-org-apache-commons-logging-impl/WeakHashtable.java.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Apache Software Foundation
     count: 1
+allrights:
+  - Copyright 2004 The Apache Software Foundation.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/apache-http-src-org-apache-commons-logging/LogFactory.java.yml b/tests/cluecode/data/ics/apache-http-src-org-apache-commons-logging/LogFactory.java.yml
index f72e661ae2..7e7ac327b8 100644
--- a/tests/cluecode/data/ics/apache-http-src-org-apache-commons-logging/LogFactory.java.yml
+++ b/tests/cluecode/data/ics/apache-http-src-org-apache-commons-logging/LogFactory.java.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Apache Software Foundation
     count: 1
+allrights:
+  - Copyright 2001-2006 The Apache Software Foundation.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/apache-http-src-org-apache-commons-logging/package.html.yml b/tests/cluecode/data/ics/apache-http-src-org-apache-commons-logging/package.html.yml
index 1c7a1982ff..c85ef55753 100644
--- a/tests/cluecode/data/ics/apache-http-src-org-apache-commons-logging/package.html.yml
+++ b/tests/cluecode/data/ics/apache-http-src-org-apache-commons-logging/package.html.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Apache Software Foundation
     count: 1
+allrights:
+  - Copyright 2001-2004 The Apache Software Foundation.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/apache-http/ThirdPartyProject.prop.yml b/tests/cluecode/data/ics/apache-http/ThirdPartyProject.prop.yml
index fd28a94506..9c653dcd8e 100644
--- a/tests/cluecode/data/ics/apache-http/ThirdPartyProject.prop.yml
+++ b/tests/cluecode/data/ics/apache-http/ThirdPartyProject.prop.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2010 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/apache-xml-src-main-java-org-apache-xpath-domapi/XPathStylesheetDOM3Exception.java.yml b/tests/cluecode/data/ics/apache-xml-src-main-java-org-apache-xpath-domapi/XPathStylesheetDOM3Exception.java.yml
index 34b038d55e..17464b8bc9 100644
--- a/tests/cluecode/data/ics/apache-xml-src-main-java-org-apache-xpath-domapi/XPathStylesheetDOM3Exception.java.yml
+++ b/tests/cluecode/data/ics/apache-xml-src-main-java-org-apache-xpath-domapi/XPathStylesheetDOM3Exception.java.yml
@@ -13,3 +13,5 @@ holders_summary:
       de Recherche en Informatique et en Automatique, Keio University)
     count: 1
 notes: the results are not great, but the French institute is a rare case
+allrights:
+  - Copyright (c) 2002 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University).
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/apache-xml/NOTICE.yml b/tests/cluecode/data/ics/apache-xml/NOTICE.yml
index 736081714e..75bc47c524 100644
--- a/tests/cluecode/data/ics/apache-xml/NOTICE.yml
+++ b/tests/cluecode/data/ics/apache-xml/NOTICE.yml
@@ -43,3 +43,17 @@ holders_summary:
     count: 1
   - value: iClick, Inc., software
     count: 1
+allrights:
+  - Copyright 1999-2006 The Apache Software Foundation
+  - Copyright 1999-2006 The Apache Software Foundation
+  - copyright (c) 1999-2002, Lotus Development Corporation., http://www.lotus.com.
+  - copyright (c) 2001-2002, Sun Microsystems., http://www.sun.com.
+  - copyright (c) 2003, IBM Corporation., http://www.ibm.com.
+  - Copyright 1999-2006 The Apache Software Foundation
+  - copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+  - copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+  - at iClick, Inc., software copyright (c) 1999.
+  - Copyright 2001-2003,2006 The Apache Software Foundation.
+  - copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+  - copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+  - copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/astl-include/algorithm.yml b/tests/cluecode/data/ics/astl-include/algorithm.yml
index d206eb5198..2c3b9c44a0 100644
--- a/tests/cluecode/data/ics/astl-include/algorithm.yml
+++ b/tests/cluecode/data/ics/astl-include/algorithm.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Android Open Source Project
     count: 1
+allrights:
+  - Copyright (c) 2009 The Android Open Source Project All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/astl-include/basic_ios.h.yml b/tests/cluecode/data/ics/astl-include/basic_ios.h.yml
index 2aeb728ed7..ea5f3c80d0 100644
--- a/tests/cluecode/data/ics/astl-include/basic_ios.h.yml
+++ b/tests/cluecode/data/ics/astl-include/basic_ios.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Android Open Source Project
     count: 1
+allrights:
+  - Copyright (c) 2010 The Android Open Source Project All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/astl-include/streambuf.yml b/tests/cluecode/data/ics/astl-include/streambuf.yml
index 2aeb728ed7..ea5f3c80d0 100644
--- a/tests/cluecode/data/ics/astl-include/streambuf.yml
+++ b/tests/cluecode/data/ics/astl-include/streambuf.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Android Open Source Project
     count: 1
+allrights:
+  - Copyright (c) 2010 The Android Open Source Project All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/astl-include/string.yml b/tests/cluecode/data/ics/astl-include/string.yml
index d206eb5198..2c3b9c44a0 100644
--- a/tests/cluecode/data/ics/astl-include/string.yml
+++ b/tests/cluecode/data/ics/astl-include/string.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Android Open Source Project
     count: 1
+allrights:
+  - Copyright (c) 2009 The Android Open Source Project All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/astl-src/ostream.cpp.yml b/tests/cluecode/data/ics/astl-src/ostream.cpp.yml
index 2aeb728ed7..ea5f3c80d0 100644
--- a/tests/cluecode/data/ics/astl-src/ostream.cpp.yml
+++ b/tests/cluecode/data/ics/astl-src/ostream.cpp.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Android Open Source Project
     count: 1
+allrights:
+  - Copyright (c) 2010 The Android Open Source Project All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/astl-tests/test_vector.cpp.yml b/tests/cluecode/data/ics/astl-tests/test_vector.cpp.yml
index d206eb5198..2c3b9c44a0 100644
--- a/tests/cluecode/data/ics/astl-tests/test_vector.cpp.yml
+++ b/tests/cluecode/data/ics/astl-tests/test_vector.cpp.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Android Open Source Project
     count: 1
+allrights:
+  - Copyright (c) 2009 The Android Open Source Project All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/astl/NOTICE.yml b/tests/cluecode/data/ics/astl/NOTICE.yml
index d206eb5198..2c3b9c44a0 100644
--- a/tests/cluecode/data/ics/astl/NOTICE.yml
+++ b/tests/cluecode/data/ics/astl/NOTICE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Android Open Source Project
     count: 1
+allrights:
+  - Copyright (c) 2009 The Android Open Source Project All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/blktrace/NOTICE.yml b/tests/cluecode/data/ics/blktrace/NOTICE.yml
index b66d6a9add..f6e584e122 100644
--- a/tests/cluecode/data/ics/blktrace/NOTICE.yml
+++ b/tests/cluecode/data/ics/blktrace/NOTICE.yml
@@ -43,3 +43,15 @@ holders_summary:
     count: 1
   - value: Silicon Graphics, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1997, 2002, 2005 Free Software Foundation, Inc.
+  - Copyright (c) 2005 Jens Axboe <axboe@suse.de>
+  - Copyright (c) 2006 Alan D. Brunelle <Alan.Brunelle@hp.com>
+  - Copyright (c) 2006 Jens Axboe <axboe@kernel.dk>
+  - Copyright (c) 2006. Bob Jenkins (bob_jenkins@burtleburtle.net)
+  - Copyright (c) 2009 Jozsef Kadlecsik (kadlec@blackhole.kfki.hu)
+  - Copyright IBM Corp. 2008
+  - Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+  - Copyright (c) 2005 Silicon Graphics, Inc.
+  - Copyright (c) 1989, 1991 Free Software Foundation, Inc.
+  - copyrighted by the Free Software Foundation
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/blktrace/btrace.spec.yml b/tests/cluecode/data/ics/blktrace/btrace.spec.yml
index 77675b89ea..be6e109455 100644
--- a/tests/cluecode/data/ics/blktrace/btrace.spec.yml
+++ b/tests/cluecode/data/ics/blktrace/btrace.spec.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: SUSE LINUX Products GmbH, Nuernberg, Germany
     count: 1
+allrights:
+  - Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/blktrace/btrace.yml b/tests/cluecode/data/ics/blktrace/btrace.yml
index d7acae7c68..59640a18f9 100644
--- a/tests/cluecode/data/ics/blktrace/btrace.yml
+++ b/tests/cluecode/data/ics/blktrace/btrace.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Silicon Graphics, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2005 Silicon Graphics, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/bluetooth-bluez-health/mcap.c.yml b/tests/cluecode/data/ics/bluetooth-bluez-health/mcap.c.yml
index ce65a68270..1d450de161 100644
--- a/tests/cluecode/data/ics/bluetooth-bluez-health/mcap.c.yml
+++ b/tests/cluecode/data/ics/bluetooth-bluez-health/mcap.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: GSyC/LibreSoft, Universidad Rey Juan Carlos
     count: 1
+allrights:
+  - Copyright (c) 2010 GSyC/LibreSoft, Universidad Rey Juan Carlos.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/bluetooth-bluez-health/mcap.h.yml b/tests/cluecode/data/ics/bluetooth-bluez-health/mcap.h.yml
index fe353fa815..2933493cff 100644
--- a/tests/cluecode/data/ics/bluetooth-bluez-health/mcap.h.yml
+++ b/tests/cluecode/data/ics/bluetooth-bluez-health/mcap.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Signove
     count: 1
+allrights:
+  - Copyright (c) 2010 GSyC/LibreSoft, Universidad Rey Juan Carlos.
+  - Copyright (c) 2010 Signove
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/bluetooth-bluez-tools/hciattach_qualcomm.c.yml b/tests/cluecode/data/ics/bluetooth-bluez-tools/hciattach_qualcomm.c.yml
index 7500697a0d..caa8ee14d0 100644
--- a/tests/cluecode/data/ics/bluetooth-bluez-tools/hciattach_qualcomm.c.yml
+++ b/tests/cluecode/data/ics/bluetooth-bluez-tools/hciattach_qualcomm.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Marcel Holtmann
     count: 1
+allrights:
+  - Copyright (c) 2005-2010 Marcel Holtmann <marcel@holtmann.org>
+  - Copyright (c) 2010, Code Aurora Forum. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/bluetooth-glib-docs-reference-glib/regex-syntax.sgml.yml b/tests/cluecode/data/ics/bluetooth-glib-docs-reference-glib/regex-syntax.sgml.yml
index d5d8709338..9c0719df1d 100644
--- a/tests/cluecode/data/ics/bluetooth-glib-docs-reference-glib/regex-syntax.sgml.yml
+++ b/tests/cluecode/data/ics/bluetooth-glib-docs-reference-glib/regex-syntax.sgml.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: University of Cambridge
     count: 1
+allrights:
+  - Copyright (c) 1997-2006 University of Cambridge.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/bluetooth-glib-gio-fam/fam-module.c.yml b/tests/cluecode/data/ics/bluetooth-glib-gio-fam/fam-module.c.yml
index 61e170869b..3997a74198 100644
--- a/tests/cluecode/data/ics/bluetooth-glib-gio-fam/fam-module.c.yml
+++ b/tests/cluecode/data/ics/bluetooth-glib-gio-fam/fam-module.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Sebastian Droge
     count: 1
+allrights:
+  - Copyright (c) 2006-2007 Red Hat, Inc.
+  - Copyright (c) 2007 Sebastian Droge.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/bluetooth-glib-gio-fen/fen-data.c.yml b/tests/cluecode/data/ics/bluetooth-glib-gio-fen/fen-data.c.yml
index ccdfaa91a2..ceeeb6afa6 100644
--- a/tests/cluecode/data/ics/bluetooth-glib-gio-fen/fen-data.c.yml
+++ b/tests/cluecode/data/ics/bluetooth-glib-gio-fen/fen-data.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Sun Microsystems
     count: 1
+allrights:
+  - Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/bluetooth-glib-gio-fen/gfendirectorymonitor.c.yml b/tests/cluecode/data/ics/bluetooth-glib-gio-fen/gfendirectorymonitor.c.yml
index 38a47ddf64..beefe77522 100644
--- a/tests/cluecode/data/ics/bluetooth-glib-gio-fen/gfendirectorymonitor.c.yml
+++ b/tests/cluecode/data/ics/bluetooth-glib-gio-fen/gfendirectorymonitor.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Sun Microsystems
     count: 1
+allrights:
+  - Copyright (c) 2006-2007 Red Hat, Inc.
+  - Copyright (c) 2007 Sebastian Droge.
+  - Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/bluetooth-glib-gobject/gobject.rc.in.yml b/tests/cluecode/data/ics/bluetooth-glib-gobject/gobject.rc.in.yml
index 32824d8aae..a553eff464 100644
--- a/tests/cluecode/data/ics/bluetooth-glib-gobject/gobject.rc.in.yml
+++ b/tests/cluecode/data/ics/bluetooth-glib-gobject/gobject.rc.in.yml
@@ -3,9 +3,11 @@ what:
   - holders
   - holders_summary
 copyrights:
-  - Copyright (c) 1998-2004 Tim Janik and Red Hat, Inc
+  - Copyright (c) 1998-2004 Tim Janik and Red Hat, Inc.
 holders:
-  - Tim Janik and Red Hat, Inc
+  - Tim Janik and Red Hat, Inc.
 holders_summary:
-  - value: Tim Janik and Red Hat, Inc
+  - value: Tim Janik and Red Hat, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1998-2004 Tim Janik and Red Hat, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/bluetooth-glib-gthread/gthread.rc.in.yml b/tests/cluecode/data/ics/bluetooth-glib-gthread/gthread.rc.in.yml
index 8411f9eb37..429649b9ff 100644
--- a/tests/cluecode/data/ics/bluetooth-glib-gthread/gthread.rc.in.yml
+++ b/tests/cluecode/data/ics/bluetooth-glib-gthread/gthread.rc.in.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Sebastian Wilhelmi. Modified by the GLib Team and others
     count: 1
+allrights:
+  - Copyright (c) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald.
+  - Copyright (c) 1998 Sebastian Wilhelmi. Modified by the GLib Team and others
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/bluetooth-glib-po/po2tbl.sed.in.yml b/tests/cluecode/data/ics/bluetooth-glib-po/po2tbl.sed.in.yml
index 9105c8eb45..d13025a831 100644
--- a/tests/cluecode/data/ics/bluetooth-glib-po/po2tbl.sed.in.yml
+++ b/tests/cluecode/data/ics/bluetooth-glib-po/po2tbl.sed.in.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Free Software Foundation, Inc. Ulrich Drepper
     count: 1
+allrights:
+  - Copyright (c) 1995 Free Software Foundation, Inc. Ulrich Drepper <drepper@gnu.ai.mit.edu> , 1995.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/bsdiff/bsdiff.1.yml b/tests/cluecode/data/ics/bsdiff/bsdiff.1.yml
index 7d0b67b32b..a233dcdfc2 100644
--- a/tests/cluecode/data/ics/bsdiff/bsdiff.1.yml
+++ b/tests/cluecode/data/ics/bsdiff/bsdiff.1.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Colin Percival
     count: 1
+allrights:
+  - Copyright 2003-2005 Colin Percival All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/bsdiff/bsdiff.c.yml b/tests/cluecode/data/ics/bsdiff/bsdiff.c.yml
index 7d0b67b32b..a233dcdfc2 100644
--- a/tests/cluecode/data/ics/bsdiff/bsdiff.c.yml
+++ b/tests/cluecode/data/ics/bsdiff/bsdiff.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Colin Percival
     count: 1
+allrights:
+  - Copyright 2003-2005 Colin Percival All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/bzip2/LICENSE.yml b/tests/cluecode/data/ics/bzip2/LICENSE.yml
index 89be1dc252..13d77be49b 100644
--- a/tests/cluecode/data/ics/bzip2/LICENSE.yml
+++ b/tests/cluecode/data/ics/bzip2/LICENSE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Julian R Seward
     count: 1
+allrights:
+  - copyright (c) 1996-2010 Julian R Seward. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/bzip2/bzip2.c.yml b/tests/cluecode/data/ics/bzip2/bzip2.c.yml
index bd9261570c..36d4a6a518 100644
--- a/tests/cluecode/data/ics/bzip2/bzip2.c.yml
+++ b/tests/cluecode/data/ics/bzip2/bzip2.c.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Julian Seward
     count: 2
+allrights:
+  - Copyright (c) 1996-2010 Julian Seward <jseward@bzip.org>
+  - Copyright (c) 1996-2010 by Julian Seward.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/bzip2/manual.html.yml b/tests/cluecode/data/ics/bzip2/manual.html.yml
index 712a0425bb..45572d38d1 100644
--- a/tests/cluecode/data/ics/bzip2/manual.html.yml
+++ b/tests/cluecode/data/ics/bzip2/manual.html.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Julian Seward
     count: 2
+allrights:
+  - Copyright (c) 1996-2010 Julian Seward
+  - copyright (c) 1996-2010 Julian Seward. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-android-jni/jni_utils.cc.yml b/tests/cluecode/data/ics/chromium-android-jni/jni_utils.cc.yml
index 516f6c0097..e0322e9c79 100644
--- a/tests/cluecode/data/ics/chromium-android-jni/jni_utils.cc.yml
+++ b/tests/cluecode/data/ics/chromium-android-jni/jni_utils.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2010 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-android/execinfo.cc.yml b/tests/cluecode/data/ics/chromium-android/execinfo.cc.yml
index de879e231e..0cd51644ce 100644
--- a/tests/cluecode/data/ics/chromium-android/execinfo.cc.yml
+++ b/tests/cluecode/data/ics/chromium-android/execinfo.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2011 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-app-sql/init_status.h.yml b/tests/cluecode/data/ics/chromium-app-sql/init_status.h.yml
index 2083c9c295..be94f7bd14 100644
--- a/tests/cluecode/data/ics/chromium-app-sql/init_status.h.yml
+++ b/tests/cluecode/data/ics/chromium-app-sql/init_status.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2009 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base-allocator/allocator.gyp.yml b/tests/cluecode/data/ics/chromium-base-allocator/allocator.gyp.yml
index 2083c9c295..be94f7bd14 100644
--- a/tests/cluecode/data/ics/chromium-base-allocator/allocator.gyp.yml
+++ b/tests/cluecode/data/ics/chromium-base-allocator/allocator.gyp.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2009 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base-i18n/icu_string_conversions.cc.yml b/tests/cluecode/data/ics/chromium-base-i18n/icu_string_conversions.cc.yml
index 3a5bfd5373..178edd8317 100644
--- a/tests/cluecode/data/ics/chromium-base-i18n/icu_string_conversions.cc.yml
+++ b/tests/cluecode/data/ics/chromium-base-i18n/icu_string_conversions.cc.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2009 The Chromium Authors. All rights reserved.
+  - Copyright (c) 1995-2006 International Business Machines Corporation and others
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base-third_party-dmg_fp/LICENSE.yml b/tests/cluecode/data/ics/chromium-base-third_party-dmg_fp/LICENSE.yml
index a7afdf3952..027b887a21 100644
--- a/tests/cluecode/data/ics/chromium-base-third_party-dmg_fp/LICENSE.yml
+++ b/tests/cluecode/data/ics/chromium-base-third_party-dmg_fp/LICENSE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Lucent Technologies
     count: 1
+allrights:
+  - Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base-third_party-dmg_fp/ThirdPartyProject.prop.yml b/tests/cluecode/data/ics/chromium-base-third_party-dmg_fp/ThirdPartyProject.prop.yml
index 9f0addd20a..65569b035e 100644
--- a/tests/cluecode/data/ics/chromium-base-third_party-dmg_fp/ThirdPartyProject.prop.yml
+++ b/tests/cluecode/data/ics/chromium-base-third_party-dmg_fp/ThirdPartyProject.prop.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2011 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base-third_party-dmg_fp/dtoa.cc.yml b/tests/cluecode/data/ics/chromium-base-third_party-dmg_fp/dtoa.cc.yml
index a7afdf3952..027b887a21 100644
--- a/tests/cluecode/data/ics/chromium-base-third_party-dmg_fp/dtoa.cc.yml
+++ b/tests/cluecode/data/ics/chromium-base-third_party-dmg_fp/dtoa.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Lucent Technologies
     count: 1
+allrights:
+  - Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base-third_party-dmg_fp/g_fmt.cc.yml b/tests/cluecode/data/ics/chromium-base-third_party-dmg_fp/g_fmt.cc.yml
index c2b4b46b52..aa95008c77 100644
--- a/tests/cluecode/data/ics/chromium-base-third_party-dmg_fp/g_fmt.cc.yml
+++ b/tests/cluecode/data/ics/chromium-base-third_party-dmg_fp/g_fmt.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Lucent Technologies
     count: 1
+allrights:
+  - Copyright (c) 1991, 1996 by Lucent Technologies.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base-third_party-dynamic_annotations/dynamic_annotations.c.yml b/tests/cluecode/data/ics/chromium-base-third_party-dynamic_annotations/dynamic_annotations.c.yml
index 596ee0773f..947113be51 100644
--- a/tests/cluecode/data/ics/chromium-base-third_party-dynamic_annotations/dynamic_annotations.c.yml
+++ b/tests/cluecode/data/ics/chromium-base-third_party-dynamic_annotations/dynamic_annotations.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright (c) 2008-2009, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base-third_party-dynamic_annotations/dynamic_annotations.gyp.yml b/tests/cluecode/data/ics/chromium-base-third_party-dynamic_annotations/dynamic_annotations.gyp.yml
index 516f6c0097..e0322e9c79 100644
--- a/tests/cluecode/data/ics/chromium-base-third_party-dynamic_annotations/dynamic_annotations.gyp.yml
+++ b/tests/cluecode/data/ics/chromium-base-third_party-dynamic_annotations/dynamic_annotations.gyp.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2010 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base-third_party-icu/icu_utf.cc.yml b/tests/cluecode/data/ics/chromium-base-third_party-icu/icu_utf.cc.yml
index 5e0608b476..d80fddff5b 100644
--- a/tests/cluecode/data/ics/chromium-base-third_party-icu/icu_utf.cc.yml
+++ b/tests/cluecode/data/ics/chromium-base-third_party-icu/icu_utf.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: International Business Machines Corporation and others
     count: 1
+allrights:
+  - Copyright (c) 1999-2006, International Business Machines Corporation and others. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base-third_party-icu/icu_utf.h.yml b/tests/cluecode/data/ics/chromium-base-third_party-icu/icu_utf.h.yml
index 74aceccde0..9fc76386fa 100644
--- a/tests/cluecode/data/ics/chromium-base-third_party-icu/icu_utf.h.yml
+++ b/tests/cluecode/data/ics/chromium-base-third_party-icu/icu_utf.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: International Business Machines Corporation and others
     count: 1
+allrights:
+  - Copyright (c) 1999-2004, International Business Machines Corporation and others. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base-third_party-nspr/LICENSE.yml b/tests/cluecode/data/ics/chromium-base-third_party-nspr/LICENSE.yml
index de8c619a63..096f6a6a0c 100644
--- a/tests/cluecode/data/ics/chromium-base-third_party-nspr/LICENSE.yml
+++ b/tests/cluecode/data/ics/chromium-base-third_party-nspr/LICENSE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: the Initial Developer
     count: 1
+allrights:
+  - Portions created by the Initial Developer are Copyright (c) 1998-2000 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base-third_party-nspr/prcpucfg.h.yml b/tests/cluecode/data/ics/chromium-base-third_party-nspr/prcpucfg.h.yml
index 593fbdfb68..219cf81d8a 100644
--- a/tests/cluecode/data/ics/chromium-base-third_party-nspr/prcpucfg.h.yml
+++ b/tests/cluecode/data/ics/chromium-base-third_party-nspr/prcpucfg.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2008, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base-third_party-nspr/prtime.cc.yml b/tests/cluecode/data/ics/chromium-base-third_party-nspr/prtime.cc.yml
index 848ac9577f..2da297e2e0 100644
--- a/tests/cluecode/data/ics/chromium-base-third_party-nspr/prtime.cc.yml
+++ b/tests/cluecode/data/ics/chromium-base-third_party-nspr/prtime.cc.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: the Initial Developer
     count: 1
+allrights:
+  - Copyright (c) 2011 Google Inc
+  - Portions created by the Initial Developer are Copyright (c) 1998-2000 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base/atomicops_internals_x86_gcc.cc.yml b/tests/cluecode/data/ics/chromium-base/atomicops_internals_x86_gcc.cc.yml
index 2ba06afc99..9385046612 100644
--- a/tests/cluecode/data/ics/chromium-base/atomicops_internals_x86_gcc.cc.yml
+++ b/tests/cluecode/data/ics/chromium-base/atomicops_internals_x86_gcc.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base/atomicops_internals_x86_gcc.h.yml b/tests/cluecode/data/ics/chromium-base/atomicops_internals_x86_gcc.h.yml
index 2ba06afc99..9385046612 100644
--- a/tests/cluecode/data/ics/chromium-base/atomicops_internals_x86_gcc.h.yml
+++ b/tests/cluecode/data/ics/chromium-base/atomicops_internals_x86_gcc.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base/base.gyp.yml b/tests/cluecode/data/ics/chromium-base/base.gyp.yml
index de879e231e..0cd51644ce 100644
--- a/tests/cluecode/data/ics/chromium-base/base.gyp.yml
+++ b/tests/cluecode/data/ics/chromium-base/base.gyp.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2011 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base/compat_execinfo.h.yml b/tests/cluecode/data/ics/chromium-base/compat_execinfo.h.yml
index 35ad75943d..06008f2625 100644
--- a/tests/cluecode/data/ics/chromium-base/compat_execinfo.h.yml
+++ b/tests/cluecode/data/ics/chromium-base/compat_execinfo.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base/file_version_info.h.yml b/tests/cluecode/data/ics/chromium-base/file_version_info.h.yml
index de879e231e..0cd51644ce 100644
--- a/tests/cluecode/data/ics/chromium-base/file_version_info.h.yml
+++ b/tests/cluecode/data/ics/chromium-base/file_version_info.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2011 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base/file_version_info_mac.mm.yml b/tests/cluecode/data/ics/chromium-base/file_version_info_mac.mm.yml
index de879e231e..0cd51644ce 100644
--- a/tests/cluecode/data/ics/chromium-base/file_version_info_mac.mm.yml
+++ b/tests/cluecode/data/ics/chromium-base/file_version_info_mac.mm.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2011 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base/foundation_utils_mac.h.yml b/tests/cluecode/data/ics/chromium-base/foundation_utils_mac.h.yml
index 4a1a606cf0..3b234109d4 100644
--- a/tests/cluecode/data/ics/chromium-base/foundation_utils_mac.h.yml
+++ b/tests/cluecode/data/ics/chromium-base/foundation_utils_mac.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2008 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base/md5.cc.yml b/tests/cluecode/data/ics/chromium-base/md5.cc.yml
index b6c8273cbc..5bad7bb9b6 100644
--- a/tests/cluecode/data/ics/chromium-base/md5.cc.yml
+++ b/tests/cluecode/data/ics/chromium-base/md5.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2006 Google Inc. All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-base/string_tokenizer.h.yml b/tests/cluecode/data/ics/chromium-base/string_tokenizer.h.yml
index 516f6c0097..e0322e9c79 100644
--- a/tests/cluecode/data/ics/chromium-base/string_tokenizer.h.yml
+++ b/tests/cluecode/data/ics/chromium-base/string_tokenizer.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2010 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-build-mac/strip_from_xcode.yml b/tests/cluecode/data/ics/chromium-build-mac/strip_from_xcode.yml
index 4a1a606cf0..3b234109d4 100644
--- a/tests/cluecode/data/ics/chromium-build-mac/strip_from_xcode.yml
+++ b/tests/cluecode/data/ics/chromium-build-mac/strip_from_xcode.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2008 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-build/branding_value.sh.yml b/tests/cluecode/data/ics/chromium-build/branding_value.sh.yml
index 4a1a606cf0..3b234109d4 100644
--- a/tests/cluecode/data/ics/chromium-build/branding_value.sh.yml
+++ b/tests/cluecode/data/ics/chromium-build/branding_value.sh.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2008 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-build/install-build-deps.sh.yml b/tests/cluecode/data/ics/chromium-build/install-build-deps.sh.yml
index 83d4e27159..de3fb6017c 100644
--- a/tests/cluecode/data/ics/chromium-build/install-build-deps.sh.yml
+++ b/tests/cluecode/data/ics/chromium-build/install-build-deps.sh.yml
@@ -19,3 +19,9 @@ holders_summary:
     count: 4
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2011 The Chromium Authors. All rights reserved.
+  - Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+  - Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+  - Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+  - Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-build/whitespace_file.txt.yml b/tests/cluecode/data/ics/chromium-build/whitespace_file.txt.yml
index de879e231e..0cd51644ce 100644
--- a/tests/cluecode/data/ics/chromium-build/whitespace_file.txt.yml
+++ b/tests/cluecode/data/ics/chromium-build/whitespace_file.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2011 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-chromeos-panels/panel_scroller_container.cc.yml b/tests/cluecode/data/ics/chromium-chrome-browser-chromeos-panels/panel_scroller_container.cc.yml
index 2083c9c295..be94f7bd14 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-chromeos-panels/panel_scroller_container.cc.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-chromeos-panels/panel_scroller_container.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2009 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-cocoa/authorization_util.mm.yml b/tests/cluecode/data/ics/chromium-chrome-browser-cocoa/authorization_util.mm.yml
index 2083c9c295..be94f7bd14 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-cocoa/authorization_util.mm.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-cocoa/authorization_util.mm.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2009 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-download/download_extensions.cc.yml b/tests/cluecode/data/ics/chromium-chrome-browser-download/download_extensions.cc.yml
index d94be1c700..34604043d3 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-download/download_extensions.cc.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-download/download_extensions.cc.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: the Initial Developer
     count: 1
+allrights:
+  - Copyright (c) 2010 The Chromium Authors. All rights reserved.
+  - Portions created by the Initial Developer are Copyright (c) 1998-1999 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-importer/firefox_profile_lock.cc.yml b/tests/cluecode/data/ics/chromium-chrome-browser-importer/firefox_profile_lock.cc.yml
index 1cda1a9801..817984931c 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-importer/firefox_profile_lock.cc.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-importer/firefox_profile_lock.cc.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: the Initial Developer
     count: 1
+allrights:
+  - Copyright (c) 2010 The Chromium Authors. All rights reserved.
+  - Portions created by the Initial Developer are Copyright (c) 2002 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-importer/firefox_profile_lock_posix.cc.yml b/tests/cluecode/data/ics/chromium-chrome-browser-importer/firefox_profile_lock_posix.cc.yml
index df80ef9e71..139863e0ca 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-importer/firefox_profile_lock_posix.cc.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-importer/firefox_profile_lock_posix.cc.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: the Initial Developer
     count: 1
+allrights:
+  - Copyright (c) 2009 The Chromium Authors. All rights reserved.
+  - Portions created by the Initial Developer are Copyright (c) 2002 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-importer/firefox_profile_lock_win.cc.yml b/tests/cluecode/data/ics/chromium-chrome-browser-importer/firefox_profile_lock_win.cc.yml
index 6413aad5c5..1f426eec33 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-importer/firefox_profile_lock_win.cc.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-importer/firefox_profile_lock_win.cc.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: the Initial Developer
     count: 1
+allrights:
+  - Copyright (c) 2008 The Chromium Authors. All rights reserved.
+  - Portions created by the Initial Developer are Copyright (c) 2002 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-importer/mork_reader.cc.yml b/tests/cluecode/data/ics/chromium-chrome-browser-importer/mork_reader.cc.yml
index 4e3f73342a..a8dfacb58a 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-importer/mork_reader.cc.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-importer/mork_reader.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: the Initial Developer
     count: 1
+allrights:
+  - Portions created by the Initial Developer are Copyright (c) 2006 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-importer/nss_decryptor.cc.yml b/tests/cluecode/data/ics/chromium-chrome-browser-importer/nss_decryptor.cc.yml
index 8a20feeb92..9803cc4580 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-importer/nss_decryptor.cc.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-importer/nss_decryptor.cc.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: the Initial Developer
     count: 1
+allrights:
+  - Copyright (c) 2011 The Chromium Authors. All rights reserved.
+  - Portions created by the Initial Developer are Copyright (c) 1994-2000 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-importer/nss_decryptor_mac.h.yml b/tests/cluecode/data/ics/chromium-chrome-browser-importer/nss_decryptor_mac.h.yml
index c611f6a41e..edbf851780 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-importer/nss_decryptor_mac.h.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-importer/nss_decryptor_mac.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: the Initial Developer
     count: 1
+allrights:
+  - Copyright (c) 2010 The Chromium Authors. All rights reserved.
+  - Portions created by the Initial Developer are Copyright (c) 1994-2000 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-importer/nss_decryptor_win.h.yml b/tests/cluecode/data/ics/chromium-chrome-browser-importer/nss_decryptor_win.h.yml
index be6529516a..47685a0e64 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-importer/nss_decryptor_win.h.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-importer/nss_decryptor_win.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: the Initial Developer
     count: 1
+allrights:
+  - Copyright (c) 2009 The Chromium Authors. All rights reserved.
+  - Portions created by the Initial Developer are Copyright (c) 1994-2000 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-metrics/system_metrics.proto.yml b/tests/cluecode/data/ics/chromium-chrome-browser-metrics/system_metrics.proto.yml
index 2083c9c295..be94f7bd14 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-metrics/system_metrics.proto.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-metrics/system_metrics.proto.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2009 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-renderer_host/render_widget_host_view_mac.mm.yml b/tests/cluecode/data/ics/chromium-chrome-browser-renderer_host/render_widget_host_view_mac.mm.yml
index 2a6b217c78..7e201d3843 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-renderer_host/render_widget_host_view_mac.mm.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-renderer_host/render_widget_host_view_mac.mm.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2011 The Chromium Authors. All rights reserved.
+  - Copyright (c) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+  - (c) 2006, 2007 Graham Dennis (graham.dennis@gmail.com)
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-resources-file_manager-css/file_manager.css.yml b/tests/cluecode/data/ics/chromium-chrome-browser-resources-file_manager-css/file_manager.css.yml
index de879e231e..0cd51644ce 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-resources-file_manager-css/file_manager.css.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-resources-file_manager-css/file_manager.css.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2011 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-resources-file_manager/harness.html.yml b/tests/cluecode/data/ics/chromium-chrome-browser-resources-file_manager/harness.html.yml
index de879e231e..0cd51644ce 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-resources-file_manager/harness.html.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-resources-file_manager/harness.html.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2011 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-resources/about_credits.html.yml b/tests/cluecode/data/ics/chromium-chrome-browser-resources/about_credits.html.yml
index 4ff54e8924..71a4e150a0 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-resources/about_credits.html.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-resources/about_credits.html.yml
@@ -358,3 +358,107 @@ holders_summary:
     count: 1
   - value: Xiph.org Foundation
     count: 1
+allrights:
+  - Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
+  - Copyright (c) 2008-2009, Google Inc. All rights reserved.
+  - Portions created by the Initial Developer are Copyright (c) 1998-2000 the Initial Developer. All Rights Reserved.
+  - Portions created by the Initial Developer are Copyright (c) 1994-2000 the Initial Developer. All Rights Reserved.
+  - (c) Copyright IBM Corporation. 2006, 2006. All Rights Reserved.
+  - Copyright (c) 2006, Google Inc. All rights reserved.
+  - Copyright (c) 2000-2008 Julian Seward. All rights reserved.
+  - Copyright (c) 2007 Red Hat, inc
+  - Copyright 2003-2005 Colin Percival All rights reserved
+  - Portions created by the Initial Developer are Copyright (c) 2000 the Initial Developer. All Rights Reserved.
+  - Copyright 1993 by OpenVision Technologies, Inc.
+  - Copyright 2007 Google Inc.
+  - Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Alexander Kellett, Alexey Proskuryakov, Alex Mathews, Allan Sandfeld Jensen, Alp Toker, Anders Carlsson, Andrew Wellington, Antti
+  - Copyright (c) 1991 Free Software Foundation, Inc.
+  - copyrighted by the Free Software Foundation
+  - Copyright (c) 1991, 1999 Free Software Foundation, Inc.
+  - copyrighted by the Free Software Foundation
+  - Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
+  - Copyright (c) 2009 Apple Inc. All Rights Reserved.
+  - Portions Copyright (c) 1999-2007 Apple Inc. All Rights Reserved.
+  - copyright (c) 1996-2010 Julian R Seward. All rights reserved.
+  - Copyright (c) 2010 The Chromium Authors. All rights reserved.
+  - Copyright (c) 1998-1999 Netscape Communications Corporation. All Rights Reserved.
+  - Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper
+  - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
+  - Copyright (c) 2008 The Khronos Group Inc.
+  - Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 by Remco Treffkorn, and others
+  - Copyright (c) 2005 by Eric S. Raymond.
+  - Copyright (c) 2007, 2010 Linux Foundation
+  - Copyright (c) 2006 IBM Corporation
+  - Copyright (c) 2000, 2006 Sun Microsystems, Inc. All rights reserved.
+  - copyright (c) 1991-1998, Thomas G. Lane. All Rights Reserved
+  - Copyright (c) 1995-2009 International Business Machines Corporation and others
+  - Copyrighy (c) 1999 TaBE Project.
+  - Copyright (c) 1999 Pai-Hsiang Hsiao. All rights reserved.
+  - Copyright (c) 1999 Computer Systems and Communication Lab, Institute of Information Science, Academia Sinica. All rights reserved.
+  - Copyright 1996 Chih-Hao Tsai @ Beckman Institute, University of Illinois c-tsai4@uiuc.edu http://casper.beckman.uiuc.edu/~c-tsai4
+  - Copyright 2000, 2001, 2002, 2003 Nara Institute of Science and Technology. All Rights Reserved.
+  - Portions created by the Initial Developer are Copyright (c) 2002 the Initial Developer. All Rights Reserved.
+  - Copyright (c) 2006-2008 Jason Evans jasone@FreeBSD.org
+  - Copyright (c) International Business Machines Corp., 2002,2007
+  - Copyright 2000-2007 Niels Provos provos@citi.umich.edu
+  - Copyright 2007-2009 Niels Provos and Nick Mathewson
+  - Copyright (c) 2004-2005, Google Inc. All rights reserved.
+  - copyright (c) 1991-1998, Thomas G. Lane. All Rights Reserved
+  - copyright holder, Aladdin Enterprises of Menlo Park
+  - copyright by the Free Software Foundation
+  - copyright by M.I.T.
+  - Copyright property of CompuServe Incorporated.
+  - Copyright (c) 1998-2005 Julian Smart, Robert Roebling
+  - Copyright (c) 2004, 2006-2009 Glenn Randers-Pehrson
+  - Copyright (c) 2000-2002 Glenn Randers-Pehrson
+  - Copyright (c) 1998, 1999 Glenn Randers-Pehrson
+  - Copyright (c) 1996, 1997 Andreas Dilger
+  - Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+  - Copyright (c) 2001-2006 Cisco Systems, Inc. All rights reserved.
+  - Copyright (c) 2010, Google Inc. All rights reserved.
+  - Copyright (c) 2010, Google Inc. All rights reserved.
+  - Copyright (c) 1998-2003 Daniel Veillard. All Rights Reserved.
+  - Copyright (c) 2001-2002 Daniel Veillard. All Rights Reserved.
+  - Copyright (c) 2001-2002 Thomas Broyer, Charlie Bozeman and Daniel Veillard. All Rights Reserved.
+  - Copyright (c) 1991 Free Software Foundation, Inc.
+  - copyrighted by the Free Software Foundation
+  - Copyright (c) 2005, 2006 Nick Galbreath - nickg at modp dot com All rights reserved.
+  - Copyright 2008 MolokoCacao All rights reserved
+  - Copyright (c) 2004-2009 Sergey Lyubka
+  - Portions Copyright (c) 2009 Gilbert Wellisch
+  - Portions created by the Initial Developer are Copyright (c) 2002 the Initial Developer. All Rights Reserved.
+  - Portions created by the Initial Developer are Copyright (c) 1998 the Initial Developer. All Rights Reserved.
+  - Copyright (c) 2004-2009 by Mulle Kybernetik. All rights reserved.
+  - Copyright (c) 2008 The Khronos Group Inc.
+  - Copyright (c) 1998-2008 The OpenSSL Project. All rights reserved.
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 2009 The Chromium Authors. All rights reserved.
+  - Copyright 2007 Google Inc.
+  - Copyright (c) 2010 The Chromium Authors. All rights reserved.
+  - Copyright 2008, Google Inc. All rights reserved.
+  - Copyright (c) 2007 Giampaolo Rodola g.rodola@gmail.com
+  - Copyright 2009, Google Inc. All rights reserved.
+  - Copyright (c) 2009 Mozilla Corporation
+  - Copyright (c) 1998-2007 Marti Maria
+  - Copyright (c) 1994-1996 SunSoft, Inc.
+  - Copyright 2009 Google Inc.
+  - Copyright (c) 2006 Bob Ippolito
+  - Copyright 2002-2008 Xiph.org Foundation
+  - Copyright 2002-2008 Jean-Marc Valin
+  - Copyright 2005-2007 Analog Devices Inc.
+  - Copyright 2005-2008 Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+  - Copyright 1993, 2002, 2006 David Rowe
+  - Copyright 2003 EpicGames
+  - Copyright 1992-1994 Jutta Degener, Carsten Bormann
+  - Copyright (c) 1995-1998 The University of Utah and the Regents of the University of California All Rights Reserved
+  - Copyright (c) 1998-2005 University of Chicago. All rights reserved.
+  - Copyright (c) 2005-2006 Arizona Board of Regents (University of Arizona). All Rights Reserved
+  - Copyright (c) Andrew Tridgell 2004-2005
+  - Copyright (c) Stefan Metzmacher 2006
+  - Copyright (c) 2005, Google Inc. All rights reserved.
+  - Copyright (c) 2007 Free Software Foundation, Inc. http://fsf.org
+  - Copyright (c) 1998-1999 Netscape Communications Corporation. All Rights Reserved.
+  - Copyright (c) 2001-2010 Peter Johnson and other Yasm developers.
+  - Copyright (c) 1995-2010 Jean-loup Gailly and Mark Adler
+  - Copyright (c) 1994-2006 Sun Microsystems Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-resources/gpu_internals.html.yml b/tests/cluecode/data/ics/chromium-chrome-browser-resources/gpu_internals.html.yml
index 516f6c0097..e0322e9c79 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-resources/gpu_internals.html.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-resources/gpu_internals.html.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2010 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-resources/keyboard_overlay.js.yml b/tests/cluecode/data/ics/chromium-chrome-browser-resources/keyboard_overlay.js.yml
index de879e231e..0cd51644ce 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-resources/keyboard_overlay.js.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-resources/keyboard_overlay.js.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2011 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-sync-engine/change_reorder_buffer.cc.yml b/tests/cluecode/data/ics/chromium-chrome-browser-sync-engine/change_reorder_buffer.cc.yml
index 35ad75943d..06008f2625 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-sync-engine/change_reorder_buffer.cc.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-sync-engine/change_reorder_buffer.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-sync-engine/clear_data_command.h.yml b/tests/cluecode/data/ics/chromium-chrome-browser-sync-engine/clear_data_command.h.yml
index 10c5cb05ed..8441a1df7c 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-sync-engine/clear_data_command.h.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-sync-engine/clear_data_command.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-ui-cocoa-applescript-examples/advanced_tab_manipulation.applescript.yml b/tests/cluecode/data/ics/chromium-chrome-browser-ui-cocoa-applescript-examples/advanced_tab_manipulation.applescript.yml
index 516f6c0097..e0322e9c79 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-ui-cocoa-applescript-examples/advanced_tab_manipulation.applescript.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-ui-cocoa-applescript-examples/advanced_tab_manipulation.applescript.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2010 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-userfeedback-proto/annotations.proto.yml b/tests/cluecode/data/ics/chromium-chrome-browser-userfeedback-proto/annotations.proto.yml
index 42804137f6..51963e7b35 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-userfeedback-proto/annotations.proto.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-userfeedback-proto/annotations.proto.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2009 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser-userfeedback-proto/chrome.proto.yml b/tests/cluecode/data/ics/chromium-chrome-browser-userfeedback-proto/chrome.proto.yml
index fd28a94506..9c653dcd8e 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser-userfeedback-proto/chrome.proto.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser-userfeedback-proto/chrome.proto.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2010 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-browser/nacl_loader.sb.yml b/tests/cluecode/data/ics/chromium-chrome-browser/nacl_loader.sb.yml
index de879e231e..0cd51644ce 100644
--- a/tests/cluecode/data/ics/chromium-chrome-browser/nacl_loader.sb.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-browser/nacl_loader.sb.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2011 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-common-extensions-docs-examples-api-i18n-cld/background.html.yml b/tests/cluecode/data/ics/chromium-chrome-common-extensions-docs-examples-api-i18n-cld/background.html.yml
index 2083c9c295..be94f7bd14 100644
--- a/tests/cluecode/data/ics/chromium-chrome-common-extensions-docs-examples-api-i18n-cld/background.html.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-common-extensions-docs-examples-api-i18n-cld/background.html.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2009 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-common-extensions-docs-examples-extensions-gdocs/chrome_ex_oauthsimple.js.yml b/tests/cluecode/data/ics/chromium-chrome-common-extensions-docs-examples-extensions-gdocs/chrome_ex_oauthsimple.js.yml
index 05e582f638..f49d5b3907 100644
--- a/tests/cluecode/data/ics/chromium-chrome-common-extensions-docs-examples-extensions-gdocs/chrome_ex_oauthsimple.js.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-common-extensions-docs-examples-extensions-gdocs/chrome_ex_oauthsimple.js.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: unitedHeroes.net
     count: 2
+allrights:
+  - copyright unitedHeroes.net
+  - Copyright (c) 2009, unitedHeroes.net All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-chrome-common-extensions-docs-examples-extensions-oauth_contacts/NOTICE.yml b/tests/cluecode/data/ics/chromium-chrome-common-extensions-docs-examples-extensions-oauth_contacts/NOTICE.yml
index 6909a1ae13..655a8c208d 100644
--- a/tests/cluecode/data/ics/chromium-chrome-common-extensions-docs-examples-extensions-oauth_contacts/NOTICE.yml
+++ b/tests/cluecode/data/ics/chromium-chrome-common-extensions-docs-examples-extensions-oauth_contacts/NOTICE.yml
@@ -16,3 +16,7 @@ holders_summary:
     count: 2
   - value: Paul Johnston Other contributors Greg Holt, Andrew Kepert, Ydnar, Lostinet
     count: 1
+allrights:
+  - copyright unitedHeroes.net
+  - Copyright (c) 2009, unitedHeroes.net All rights reserved.
+  - Copyright Paul Johnston 2000 - 2002. Other contributors Greg Holt, Andrew Kepert, Ydnar, Lostinet
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-crypto-third_party-nss/blapi.h.yml b/tests/cluecode/data/ics/chromium-crypto-third_party-nss/blapi.h.yml
index 36bfc34d0a..22e7877cd1 100644
--- a/tests/cluecode/data/ics/chromium-crypto-third_party-nss/blapi.h.yml
+++ b/tests/cluecode/data/ics/chromium-crypto-third_party-nss/blapi.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: the Initial Developer
     count: 1
+allrights:
+  - Portions created by the Initial Developer are Copyright (c) 1994-2000 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-crypto-third_party-nss/sha256.h.yml b/tests/cluecode/data/ics/chromium-crypto-third_party-nss/sha256.h.yml
index 50d775dbc7..fea69ba16b 100644
--- a/tests/cluecode/data/ics/chromium-crypto-third_party-nss/sha256.h.yml
+++ b/tests/cluecode/data/ics/chromium-crypto-third_party-nss/sha256.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: the Initial Developer
     count: 1
+allrights:
+  - Portions created by the Initial Developer are Copyright (c) 2002 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-googleurl-base/basictypes.h.yml b/tests/cluecode/data/ics/chromium-googleurl-base/basictypes.h.yml
index fb4bafe296..007a3e534e 100644
--- a/tests/cluecode/data/ics/chromium-googleurl-base/basictypes.h.yml
+++ b/tests/cluecode/data/ics/chromium-googleurl-base/basictypes.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2001 - 2003 Google Inc. All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-googleurl-base/logging.cc.yml b/tests/cluecode/data/ics/chromium-googleurl-base/logging.cc.yml
index 787d756a0d..73ae41aa09 100644
--- a/tests/cluecode/data/ics/chromium-googleurl-base/logging.cc.yml
+++ b/tests/cluecode/data/ics/chromium-googleurl-base/logging.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2007, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-googleurl-base/logging.h.yml b/tests/cluecode/data/ics/chromium-googleurl-base/logging.h.yml
index b6c8273cbc..865a746d3a 100644
--- a/tests/cluecode/data/ics/chromium-googleurl-base/logging.h.yml
+++ b/tests/cluecode/data/ics/chromium-googleurl-base/logging.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2006 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-googleurl-base/scoped_ptr.h.yml b/tests/cluecode/data/ics/chromium-googleurl-base/scoped_ptr.h.yml
index 566b356417..0d70bd7099 100644
--- a/tests/cluecode/data/ics/chromium-googleurl-base/scoped_ptr.h.yml
+++ b/tests/cluecode/data/ics/chromium-googleurl-base/scoped_ptr.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Peter Dimov
     count: 1
+allrights:
+  - (c) Copyright Greg Colvin and Beman Dawes 1998, 1999.
+  - Copyright (c) 2001, 2002 Peter Dimov
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-googleurl-src/gurl_unittest.cc.yml b/tests/cluecode/data/ics/chromium-googleurl-src/gurl_unittest.cc.yml
index c5461a1f8d..ff51230eb2 100644
--- a/tests/cluecode/data/ics/chromium-googleurl-src/gurl_unittest.cc.yml
+++ b/tests/cluecode/data/ics/chromium-googleurl-src/gurl_unittest.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2007 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-googleurl-src/url_canon_ip.cc.yml b/tests/cluecode/data/ics/chromium-googleurl-src/url_canon_ip.cc.yml
index c33bb9af53..fa2a05dc6e 100644
--- a/tests/cluecode/data/ics/chromium-googleurl-src/url_canon_ip.cc.yml
+++ b/tests/cluecode/data/ics/chromium-googleurl-src/url_canon_ip.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2009, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-googleurl-src/url_common.h.yml b/tests/cluecode/data/ics/chromium-googleurl-src/url_common.h.yml
index 480e9e8e3f..e0a9c52c62 100644
--- a/tests/cluecode/data/ics/chromium-googleurl-src/url_common.h.yml
+++ b/tests/cluecode/data/ics/chromium-googleurl-src/url_common.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2010, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-googleurl-src/url_parse.cc.yml b/tests/cluecode/data/ics/chromium-googleurl-src/url_parse.cc.yml
index e8f81cb6bd..c34e755cb0 100644
--- a/tests/cluecode/data/ics/chromium-googleurl-src/url_parse.cc.yml
+++ b/tests/cluecode/data/ics/chromium-googleurl-src/url_parse.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: the Initial Developer
     count: 1
+allrights:
+  - Portions created by the Initial Developer are Copyright (c) 1998 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-googleurl-src/url_test_utils.h.yml b/tests/cluecode/data/ics/chromium-googleurl-src/url_test_utils.h.yml
index c5461a1f8d..524ed5c367 100644
--- a/tests/cluecode/data/ics/chromium-googleurl-src/url_test_utils.h.yml
+++ b/tests/cluecode/data/ics/chromium-googleurl-src/url_test_utils.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2007 Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-googleurl/LICENSE.txt.yml b/tests/cluecode/data/ics/chromium-googleurl/LICENSE.txt.yml
index a5de130fa9..b554713c57 100644
--- a/tests/cluecode/data/ics/chromium-googleurl/LICENSE.txt.yml
+++ b/tests/cluecode/data/ics/chromium-googleurl/LICENSE.txt.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: the Initial Developer
     count: 1
+allrights:
+  - Copyright 2007, Google Inc. All rights reserved.
+  - Portions created by the Initial Developer are Copyright (c) 1998 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-net-base/cookie_monster.cc.yml b/tests/cluecode/data/ics/chromium-net-base/cookie_monster.cc.yml
index 7d6dd46a3d..700457d47c 100644
--- a/tests/cluecode/data/ics/chromium-net-base/cookie_monster.cc.yml
+++ b/tests/cluecode/data/ics/chromium-net-base/cookie_monster.cc.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: the Initial Developer
     count: 1
+allrights:
+  - Copyright (c) 2011 The Chromium Authors. All rights reserved.
+  - Portions created by the Initial Developer are Copyright (c) 2003 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-net-base/effective_tld_names.dat.yml b/tests/cluecode/data/ics/chromium-net-base/effective_tld_names.dat.yml
index bec4c936fb..a9e0d6cd48 100644
--- a/tests/cluecode/data/ics/chromium-net-base/effective_tld_names.dat.yml
+++ b/tests/cluecode/data/ics/chromium-net-base/effective_tld_names.dat.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: the Initial Developer
     count: 1
+allrights:
+  - Portions created by the Initial Developer are Copyright (c) 2007 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-net-base/ssl_false_start_blacklist_process.cc.yml b/tests/cluecode/data/ics/chromium-net-base/ssl_false_start_blacklist_process.cc.yml
index 9dbde1a17a..036a2f4613 100644
--- a/tests/cluecode/data/ics/chromium-net-base/ssl_false_start_blacklist_process.cc.yml
+++ b/tests/cluecode/data/ics/chromium-net-base/ssl_false_start_blacklist_process.cc.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 2
+allrights:
+  - Copyright (c) 2010 The Chromium Authors. All rights reserved.
+  - Copyright (c) 2010 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-net-base/x509_cert_types_mac_unittest.cc.yml b/tests/cluecode/data/ics/chromium-net-base/x509_cert_types_mac_unittest.cc.yml
index 0523e56696..6ecda23fea 100644
--- a/tests/cluecode/data/ics/chromium-net-base/x509_cert_types_mac_unittest.cc.yml
+++ b/tests/cluecode/data/ics/chromium-net-base/x509_cert_types_mac_unittest.cc.yml
@@ -21,3 +21,9 @@ holders_summary:
     count: 2
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2010 The Chromium Authors. All rights reserved.
+  - (c) Kasim 2005
+  - (c) 1999 Entrust.net Limited
+  - (c) Kasim 2005
+  - (c) 1999 Entrust.net Limited
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-net-base/x509_certificate_unittest.cc.yml b/tests/cluecode/data/ics/chromium-net-base/x509_certificate_unittest.cc.yml
index de879e231e..0cd51644ce 100644
--- a/tests/cluecode/data/ics/chromium-net-base/x509_certificate_unittest.cc.yml
+++ b/tests/cluecode/data/ics/chromium-net-base/x509_certificate_unittest.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2011 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-net-data-proxy_resolver_perftest/no-ads.pac.yml b/tests/cluecode/data/ics/chromium-net-data-proxy_resolver_perftest/no-ads.pac.yml
index 2477f610e1..7b74e4f565 100644
--- a/tests/cluecode/data/ics/chromium-net-data-proxy_resolver_perftest/no-ads.pac.yml
+++ b/tests/cluecode/data/ics/chromium-net-data-proxy_resolver_perftest/no-ads.pac.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: John LoVerso
     count: 1
+allrights:
+  - Copyright 1996-2004, John LoVerso. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-net-disk_cache/sparse_control.cc.yml b/tests/cluecode/data/ics/chromium-net-disk_cache/sparse_control.cc.yml
index d0de80cec7..b6e75b6df7 100644
--- a/tests/cluecode/data/ics/chromium-net-disk_cache/sparse_control.cc.yml
+++ b/tests/cluecode/data/ics/chromium-net-disk_cache/sparse_control.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2009-2010 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-net-ftp/ftp_network_layer.cc.yml b/tests/cluecode/data/ics/chromium-net-ftp/ftp_network_layer.cc.yml
index 4a1a606cf0..3b234109d4 100644
--- a/tests/cluecode/data/ics/chromium-net-ftp/ftp_network_layer.cc.yml
+++ b/tests/cluecode/data/ics/chromium-net-ftp/ftp_network_layer.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2008 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-net-http/des.cc.yml b/tests/cluecode/data/ics/chromium-net-http/des.cc.yml
index ccdc064915..26a0c6ca2d 100644
--- a/tests/cluecode/data/ics/chromium-net-http/des.cc.yml
+++ b/tests/cluecode/data/ics/chromium-net-http/des.cc.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2011 The Chromium Authors. All rights reserved.
+  - Copyright (c) 2003 IBM Corporation. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-net-http/http_auth_handler_ntlm_portable.cc.yml b/tests/cluecode/data/ics/chromium-net-http/http_auth_handler_ntlm_portable.cc.yml
index f685362d27..6d92089419 100644
--- a/tests/cluecode/data/ics/chromium-net-http/http_auth_handler_ntlm_portable.cc.yml
+++ b/tests/cluecode/data/ics/chromium-net-http/http_auth_handler_ntlm_portable.cc.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2010 The Chromium Authors. All rights reserved.
+  - Copyright (c) 2003 IBM Corporation. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-net-http/http_chunked_decoder.cc.yml b/tests/cluecode/data/ics/chromium-net-http/http_chunked_decoder.cc.yml
index 4d1208e382..625f92773d 100644
--- a/tests/cluecode/data/ics/chromium-net-http/http_chunked_decoder.cc.yml
+++ b/tests/cluecode/data/ics/chromium-net-http/http_chunked_decoder.cc.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: the Initial Developer
     count: 1
+allrights:
+  - Copyright (c) 2010 The Chromium Authors. All rights reserved.
+  - Portions created by the Initial Developer are Copyright (c) 2001 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-net-http/md4.cc.yml b/tests/cluecode/data/ics/chromium-net-http/md4.cc.yml
index 08ad0c5430..785f9a5f7b 100644
--- a/tests/cluecode/data/ics/chromium-net-http/md4.cc.yml
+++ b/tests/cluecode/data/ics/chromium-net-http/md4.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: IBM Corporation
     count: 1
+allrights:
+  - Copyright (c) 2003 IBM Corporation. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-net-socket/ssl_client_socket_nss.cc.yml b/tests/cluecode/data/ics/chromium-net-socket/ssl_client_socket_nss.cc.yml
index 81b87a3924..eecd9336f2 100644
--- a/tests/cluecode/data/ics/chromium-net-socket/ssl_client_socket_nss.cc.yml
+++ b/tests/cluecode/data/ics/chromium-net-socket/ssl_client_socket_nss.cc.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: the Initial Developer
     count: 1
+allrights:
+  - Copyright (c) 2011 The Chromium Authors. All rights reserved.
+  - Portions created by the Initial Developer are Copyright (c) 2000 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-net-tools-testserver/chromiumsync.py.yml b/tests/cluecode/data/ics/chromium-net-tools-testserver/chromiumsync.py.yml
index 516f6c0097..e0322e9c79 100644
--- a/tests/cluecode/data/ics/chromium-net-tools-testserver/chromiumsync.py.yml
+++ b/tests/cluecode/data/ics/chromium-net-tools-testserver/chromiumsync.py.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2010 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-net-tools-tld_cleanup/tld_cleanup.cc.yml b/tests/cluecode/data/ics/chromium-net-tools-tld_cleanup/tld_cleanup.cc.yml
index 782e4e4f95..010fe70072 100644
--- a/tests/cluecode/data/ics/chromium-net-tools-tld_cleanup/tld_cleanup.cc.yml
+++ b/tests/cluecode/data/ics/chromium-net-tools-tld_cleanup/tld_cleanup.cc.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 2
+allrights:
+  - Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+  - Copyright (c) 2009 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src-gtest/gtest.cc.yml b/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src-gtest/gtest.cc.yml
index 942b76e270..6069b5e76b 100644
--- a/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src-gtest/gtest.cc.yml
+++ b/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src-gtest/gtest.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2005, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src-gtest/gtest_main.cc.yml b/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src-gtest/gtest_main.cc.yml
index 1201bead34..15bf8bca4e 100644
--- a/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src-gtest/gtest_main.cc.yml
+++ b/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src-gtest/gtest_main.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2006, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src/codetablewriter_interface.h.yml b/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src/codetablewriter_interface.h.yml
index 7a73bfbd2e..c5514c0212 100644
--- a/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src/codetablewriter_interface.h.yml
+++ b/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src/codetablewriter_interface.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2008 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src/gflags.cc.yml b/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src/gflags.cc.yml
index 16814c32c4..3e86054126 100644
--- a/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src/gflags.cc.yml
+++ b/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src/gflags.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright (c) 2006, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src/mutex.h.yml b/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src/mutex.h.yml
index e9927a41c7..a90921370f 100644
--- a/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src/mutex.h.yml
+++ b/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src/mutex.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright (c) 2007, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src/zconf.h.yml b/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src/zconf.h.yml
index e46e3f037f..32808b9155 100644
--- a/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src/zconf.h.yml
+++ b/tests/cluecode/data/ics/chromium-sdch-open-vcdiff-src/zconf.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jean-loup Gailly
     count: 1
+allrights:
+  - Copyright (c) 1995-2005 Jean-loup Gailly.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-testing-gmock-include-gmock/gmock-cardinalities.h.yml b/tests/cluecode/data/ics/chromium-testing-gmock-include-gmock/gmock-cardinalities.h.yml
index 787d756a0d..73ae41aa09 100644
--- a/tests/cluecode/data/ics/chromium-testing-gmock-include-gmock/gmock-cardinalities.h.yml
+++ b/tests/cluecode/data/ics/chromium-testing-gmock-include-gmock/gmock-cardinalities.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2007, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-testing-gmock-scripts-generator-cpp/gmock_class_test.py.yml b/tests/cluecode/data/ics/chromium-testing-gmock-scripts-generator-cpp/gmock_class_test.py.yml
index bb3b10f211..f2f0f05ee2 100644
--- a/tests/cluecode/data/ics/chromium-testing-gmock-scripts-generator-cpp/gmock_class_test.py.yml
+++ b/tests/cluecode/data/ics/chromium-testing-gmock-scripts-generator-cpp/gmock_class_test.py.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Neal Norwitz
     count: 1
+allrights:
+  - Copyright 2009 Neal Norwitz All Rights Reserved.
+  - Portions Copyright 2009 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-testing-gmock-scripts-generator/gmock_gen.py.yml b/tests/cluecode/data/ics/chromium-testing-gmock-scripts-generator/gmock_gen.py.yml
index 7a73bfbd2e..c5514c0212 100644
--- a/tests/cluecode/data/ics/chromium-testing-gmock-scripts-generator/gmock_gen.py.yml
+++ b/tests/cluecode/data/ics/chromium-testing-gmock-scripts-generator/gmock_gen.py.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2008 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-testing-gmock-scripts/fuse_gmock_files.py.yml b/tests/cluecode/data/ics/chromium-testing-gmock-scripts/fuse_gmock_files.py.yml
index c33bb9af53..fa2a05dc6e 100644
--- a/tests/cluecode/data/ics/chromium-testing-gmock-scripts/fuse_gmock_files.py.yml
+++ b/tests/cluecode/data/ics/chromium-testing-gmock-scripts/fuse_gmock_files.py.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2009, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-testing-gmock-scripts/gmock_doctor.py.yml b/tests/cluecode/data/ics/chromium-testing-gmock-scripts/gmock_doctor.py.yml
index 593fbdfb68..219cf81d8a 100644
--- a/tests/cluecode/data/ics/chromium-testing-gmock-scripts/gmock_doctor.py.yml
+++ b/tests/cluecode/data/ics/chromium-testing-gmock-scripts/gmock_doctor.py.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2008, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-testing-gmock-test/gmock_test_utils.py.yml b/tests/cluecode/data/ics/chromium-testing-gmock-test/gmock_test_utils.py.yml
index 1201bead34..15bf8bca4e 100644
--- a/tests/cluecode/data/ics/chromium-testing-gmock-test/gmock_test_utils.py.yml
+++ b/tests/cluecode/data/ics/chromium-testing-gmock-test/gmock_test_utils.py.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2006, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-testing-gmock/COPYING.yml b/tests/cluecode/data/ics/chromium-testing-gmock/COPYING.yml
index 593fbdfb68..219cf81d8a 100644
--- a/tests/cluecode/data/ics/chromium-testing-gmock/COPYING.yml
+++ b/tests/cluecode/data/ics/chromium-testing-gmock/COPYING.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2008, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-testing-gtest-include-gtest-internal/gtest-linked_ptr.h.yml b/tests/cluecode/data/ics/chromium-testing-gtest-include-gtest-internal/gtest-linked_ptr.h.yml
index c5e4ce567b..1e8bcec3df 100644
--- a/tests/cluecode/data/ics/chromium-testing-gtest-include-gtest-internal/gtest-linked_ptr.h.yml
+++ b/tests/cluecode/data/ics/chromium-testing-gtest-include-gtest-internal/gtest-linked_ptr.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2003 Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-testing-gtest-include-gtest-internal/gtest-tuple.h.yml b/tests/cluecode/data/ics/chromium-testing-gtest-include-gtest-internal/gtest-tuple.h.yml
index 42804137f6..51963e7b35 100644
--- a/tests/cluecode/data/ics/chromium-testing-gtest-include-gtest-internal/gtest-tuple.h.yml
+++ b/tests/cluecode/data/ics/chromium-testing-gtest-include-gtest-internal/gtest-tuple.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2009 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-testing-gtest-samples/sample10_unittest.cc.yml b/tests/cluecode/data/ics/chromium-testing-gtest-samples/sample10_unittest.cc.yml
index 42804137f6..51963e7b35 100644
--- a/tests/cluecode/data/ics/chromium-testing-gtest-samples/sample10_unittest.cc.yml
+++ b/tests/cluecode/data/ics/chromium-testing-gtest-samples/sample10_unittest.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2009 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-testing-gtest-scripts/gen_gtest_pred_impl.py.yml b/tests/cluecode/data/ics/chromium-testing-gtest-scripts/gen_gtest_pred_impl.py.yml
index 4c85b1c8d6..5abc1012f6 100644
--- a/tests/cluecode/data/ics/chromium-testing-gtest-scripts/gen_gtest_pred_impl.py.yml
+++ b/tests/cluecode/data/ics/chromium-testing-gtest-scripts/gen_gtest_pred_impl.py.yml
@@ -13,3 +13,7 @@ holders:
 holders_summary:
   - value: Google
     count: 3
+allrights:
+  - Copyright 2006, Google Inc. All rights reserved.
+  - Copyright 2006, Google Inc. All rights reserved.
+  - Copyright 2006, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-testing-gtest-src/gtest-port.cc.yml b/tests/cluecode/data/ics/chromium-testing-gtest-src/gtest-port.cc.yml
index 593fbdfb68..219cf81d8a 100644
--- a/tests/cluecode/data/ics/chromium-testing-gtest-src/gtest-port.cc.yml
+++ b/tests/cluecode/data/ics/chromium-testing-gtest-src/gtest-port.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2008, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-testing-gtest-test/gtest-linked_ptr_test.cc.yml b/tests/cluecode/data/ics/chromium-testing-gtest-test/gtest-linked_ptr_test.cc.yml
index a33ef0193d..40aaa51e06 100644
--- a/tests/cluecode/data/ics/chromium-testing-gtest-test/gtest-linked_ptr_test.cc.yml
+++ b/tests/cluecode/data/ics/chromium-testing-gtest-test/gtest-linked_ptr_test.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2003, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-testing-gtest-test/gtest_catch_exceptions_test.py.yml b/tests/cluecode/data/ics/chromium-testing-gtest-test/gtest_catch_exceptions_test.py.yml
index fd28a94506..9c653dcd8e 100644
--- a/tests/cluecode/data/ics/chromium-testing-gtest-test/gtest_catch_exceptions_test.py.yml
+++ b/tests/cluecode/data/ics/chromium-testing-gtest-test/gtest_catch_exceptions_test.py.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2010 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-testing-gtest-test/gtest_filter_unittest.py.yml b/tests/cluecode/data/ics/chromium-testing-gtest-test/gtest_filter_unittest.py.yml
index 6c88e7f86c..438a169c3f 100644
--- a/tests/cluecode/data/ics/chromium-testing-gtest-test/gtest_filter_unittest.py.yml
+++ b/tests/cluecode/data/ics/chromium-testing-gtest-test/gtest_filter_unittest.py.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2005 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-testing-gtest-test/gtest_shuffle_test.py.yml b/tests/cluecode/data/ics/chromium-testing-gtest-test/gtest_shuffle_test.py.yml
index 42804137f6..51963e7b35 100644
--- a/tests/cluecode/data/ics/chromium-testing-gtest-test/gtest_shuffle_test.py.yml
+++ b/tests/cluecode/data/ics/chromium-testing-gtest-test/gtest_shuffle_test.py.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2009 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-testing/generate_gmock_mutant.py.yml b/tests/cluecode/data/ics/chromium-testing/generate_gmock_mutant.py.yml
index 1bbbb740b0..0a54a84b59 100644
--- a/tests/cluecode/data/ics/chromium-testing/generate_gmock_mutant.py.yml
+++ b/tests/cluecode/data/ics/chromium-testing/generate_gmock_mutant.py.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 2
+allrights:
+  - Copyright (c) 2009 The Chromium Authors. All rights reserved.
+  - Copyright (c) 2009 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent-compat-sys/_libevent_time.h.yml b/tests/cluecode/data/ics/chromium-third_party-libevent-compat-sys/_libevent_time.h.yml
index b695b41745..254d1a5250 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent-compat-sys/_libevent_time.h.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent-compat-sys/_libevent_time.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1982, 1986, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent-compat-sys/queue.h.yml b/tests/cluecode/data/ics/chromium-third_party-libevent-compat-sys/queue.h.yml
index 32136a19f8..c82699a9a6 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent-compat-sys/queue.h.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent-compat-sys/queue.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1991, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent-test/regress_dns.c.yml b/tests/cluecode/data/ics/chromium-third_party-libevent-test/regress_dns.c.yml
index d5f3f00069..2c73105efb 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent-test/regress_dns.c.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent-test/regress_dns.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Niels Provos
     count: 1
+allrights:
+  - Copyright (c) 2003-2006 Niels Provos <provos@citi.umich.edu> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent/buffer.c.yml b/tests/cluecode/data/ics/chromium-third_party-libevent/buffer.c.yml
index 9b31187365..5da778e16a 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent/buffer.c.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent/buffer.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Niels Provos
     count: 1
+allrights:
+  - Copyright (c) 2002, 2003 Niels Provos <provos@citi.umich.edu> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent/devpoll.c.yml b/tests/cluecode/data/ics/chromium-third_party-libevent/devpoll.c.yml
index c6265a65ed..f8949c63b7 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent/devpoll.c.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent/devpoll.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Niels Provos
     count: 1
+allrights:
+  - Copyright 2000-2004 Niels Provos <provos@citi.umich.edu> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent/epoll.c.yml b/tests/cluecode/data/ics/chromium-third_party-libevent/epoll.c.yml
index f35160b5dd..5acdf8a46d 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent/epoll.c.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent/epoll.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Niels Provos
     count: 1
+allrights:
+  - Copyright 2000-2003 Niels Provos <provos@citi.umich.edu> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent/epoll_sub.c.yml b/tests/cluecode/data/ics/chromium-third_party-libevent/epoll_sub.c.yml
index 11acbe0911..17565dc503 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent/epoll_sub.c.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent/epoll_sub.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Niels Provos
     count: 1
+allrights:
+  - Copyright 2003 Niels Provos <provos@citi.umich.edu> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent/evbuffer.c.yml b/tests/cluecode/data/ics/chromium-third_party-libevent/evbuffer.c.yml
index db14d7f80d..839052b5d6 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent/evbuffer.c.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent/evbuffer.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Niels Provos
     count: 1
+allrights:
+  - Copyright (c) 2002-2004 Niels Provos <provos@citi.umich.edu> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent/evdns.3.yml b/tests/cluecode/data/ics/chromium-third_party-libevent/evdns.3.yml
index f682ceb121..78c15bfcf7 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent/evdns.3.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent/evdns.3.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Niels Provos
     count: 1
+allrights:
+  - Copyright (c) 2006 Niels Provos <provos@citi.umich.edu> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent/evdns.h.yml b/tests/cluecode/data/ics/chromium-third_party-libevent/evdns.h.yml
index f682ceb121..78c15bfcf7 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent/evdns.h.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent/evdns.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Niels Provos
     count: 1
+allrights:
+  - Copyright (c) 2006 Niels Provos <provos@citi.umich.edu> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent/event-internal.h.yml b/tests/cluecode/data/ics/chromium-third_party-libevent/event-internal.h.yml
index 02b031d3d1..e58d22e0e7 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent/event-internal.h.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent/event-internal.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Niels Provos
     count: 1
+allrights:
+  - Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent/event.3.yml b/tests/cluecode/data/ics/chromium-third_party-libevent/event.3.yml
index 99352509f0..8c51961721 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent/event.3.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent/event.3.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Artur Grabowski
     count: 1
+allrights:
+  - Copyright (c) 2000 Artur Grabowski <art@openbsd.org> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent/event.h.yml b/tests/cluecode/data/ics/chromium-third_party-libevent/event.h.yml
index 3050e7fb94..ac643fd91a 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent/event.h.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent/event.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Niels Provos
     count: 1
+allrights:
+  - Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent/event_rpcgen.py.yml b/tests/cluecode/data/ics/chromium-third_party-libevent/event_rpcgen.py.yml
index 176288f705..1ccbbb0d8f 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent/event_rpcgen.py.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent/event_rpcgen.py.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Niels Provos
     count: 1
+allrights:
+  - Copyright (c) 2005 Niels Provos <provos@citi.umich.edu> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent/event_tagging.c.yml b/tests/cluecode/data/ics/chromium-third_party-libevent/event_tagging.c.yml
index 4a6f573af4..a7b2d00572 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent/event_tagging.c.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent/event_tagging.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Niels Provos
     count: 1
+allrights:
+  - Copyright (c) 2003, 2004 Niels Provos <provos@citi.umich.edu> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent/evport.c.yml b/tests/cluecode/data/ics/chromium-third_party-libevent/evport.c.yml
index 6c58703510..f445752338 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent/evport.c.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent/evport.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Sun Microsystems
     count: 1
+allrights:
+  - Copyright (c) 2007 Sun Microsystems. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent/evsignal.h.yml b/tests/cluecode/data/ics/chromium-third_party-libevent/evsignal.h.yml
index 32c6976045..364410df3c 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent/evsignal.h.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent/evsignal.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Niels Provos
     count: 1
+allrights:
+  - Copyright 2000-2002 Niels Provos <provos@citi.umich.edu> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent/evutil.c.yml b/tests/cluecode/data/ics/chromium-third_party-libevent/evutil.c.yml
index 216ba7dc56..cb53191740 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent/evutil.c.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent/evutil.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Niels Provos
     count: 1
+allrights:
+  - Copyright (c) 2007 Niels Provos <provos@citi.umich.edu> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent/http-internal.h.yml b/tests/cluecode/data/ics/chromium-third_party-libevent/http-internal.h.yml
index 3fbd9ca225..d5028527a2 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent/http-internal.h.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent/http-internal.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Niels Provos
     count: 1
+allrights:
+  - Copyright 2001 Niels Provos <provos@citi.umich.edu> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent/http.c.yml b/tests/cluecode/data/ics/chromium-third_party-libevent/http.c.yml
index 9072129877..c00f64501d 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent/http.c.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent/http.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Niels Provos
     count: 1
+allrights:
+  - Copyright (c) 2002-2006 Niels Provos <provos@citi.umich.edu> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent/log.c.yml b/tests/cluecode/data/ics/chromium-third_party-libevent/log.c.yml
index bdf419fa30..40e478aa42 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent/log.c.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent/log.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 2005 Nick Mathewson <nickm@freehaven.net>
+  - Copyright (c) 2000 Dug Song <dugsong@monkey.org>
+  - Copyright (c) 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent/min_heap.h.yml b/tests/cluecode/data/ics/chromium-third_party-libevent/min_heap.h.yml
index 172a507a80..ac77cd046f 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent/min_heap.h.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent/min_heap.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Maxim Yegorushkin
     count: 1
+allrights:
+  - Copyright (c) 2006 Maxim Yegorushkin <maxim.yegorushkin@gmail.com> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libevent/strlcpy.c.yml b/tests/cluecode/data/ics/chromium-third_party-libevent/strlcpy.c.yml
index f11b7c9d4e..8ae6c28af7 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libevent/strlcpy.c.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libevent/strlcpy.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Todd C. Miller
     count: 1
+allrights:
+  - Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libjingle-source-talk-base/httpbase.cc.yml b/tests/cluecode/data/ics/chromium-third_party-libjingle-source-talk-base/httpbase.cc.yml
index d3fff37611..93d26d85e1 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libjingle-source-talk-base/httpbase.cc.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libjingle-source-talk-base/httpbase.cc.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Google
     count: 2
+allrights:
+  - Copyright 2004-2005, Google Inc.
+  - Copyright 2005 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-libjingle-source/COPYING.yml b/tests/cluecode/data/ics/chromium-third_party-libjingle-source/COPYING.yml
index 9ef3dcbc3b..a35d827644 100644
--- a/tests/cluecode/data/ics/chromium-third_party-libjingle-source/COPYING.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-libjingle-source/COPYING.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright (c) 2004-2005, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-modp_b64/LICENSE.yml b/tests/cluecode/data/ics/chromium-third_party-modp_b64/LICENSE.yml
index e191755a5e..2de084a782 100644
--- a/tests/cluecode/data/ics/chromium-third_party-modp_b64/LICENSE.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-modp_b64/LICENSE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Nick Galbreath
     count: 1
+allrights:
+  - Copyright (c) 2005, 2006 Nick Galbreath - nickg at modp dot com All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-modp_b64/modp_b64.cc.yml b/tests/cluecode/data/ics/chromium-third_party-modp_b64/modp_b64.cc.yml
index e191755a5e..2de084a782 100644
--- a/tests/cluecode/data/ics/chromium-third_party-modp_b64/modp_b64.cc.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-modp_b64/modp_b64.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Nick Galbreath
     count: 1
+allrights:
+  - Copyright (c) 2005, 2006 Nick Galbreath - nickg at modp dot com All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-third_party-modp_b64/modp_b64.h.yml b/tests/cluecode/data/ics/chromium-third_party-modp_b64/modp_b64.h.yml
index 0fd8df20f8..9b6c191746 100644
--- a/tests/cluecode/data/ics/chromium-third_party-modp_b64/modp_b64.h.yml
+++ b/tests/cluecode/data/ics/chromium-third_party-modp_b64/modp_b64.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Nick Galbreath
     count: 1
+allrights:
+  - Copyright (c) 2005, 2006, Nick Galbreath - nickg at modp dot com All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-webkit-glue-resources/README.txt.yml b/tests/cluecode/data/ics/chromium-webkit-glue-resources/README.txt.yml
index d58ab1afcd..1918203a15 100644
--- a/tests/cluecode/data/ics/chromium-webkit-glue-resources/README.txt.yml
+++ b/tests/cluecode/data/ics/chromium-webkit-glue-resources/README.txt.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: the Initial Developer
     count: 1
+allrights:
+  - Portions created by the Initial Developer are Copyright (c) 1998 the Initial Developer. All Rights Reserved.
+  - Copyright (c) 2005 Apple Computer, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-webkit-glue/inspector_strings.grd.yml b/tests/cluecode/data/ics/chromium-webkit-glue/inspector_strings.grd.yml
index d74394782a..9f76671ac8 100644
--- a/tests/cluecode/data/ics/chromium-webkit-glue/inspector_strings.grd.yml
+++ b/tests/cluecode/data/ics/chromium-webkit-glue/inspector_strings.grd.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Apple Inc.
     count: 1
+allrights:
+  - Copyright (c) 2007, 2008 Apple Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-webkit-glue/multipart_response_delegate.h.yml b/tests/cluecode/data/ics/chromium-webkit-glue/multipart_response_delegate.h.yml
index 8bdf1412e9..21bbf7a1c7 100644
--- a/tests/cluecode/data/ics/chromium-webkit-glue/multipart_response_delegate.h.yml
+++ b/tests/cluecode/data/ics/chromium-webkit-glue/multipart_response_delegate.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: the Initial Developer
     count: 1
+allrights:
+  - Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+  - Portions created by the Initial Developer are Copyright (c) 1998 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium-webkit-glue/webkit_strings.grd.yml b/tests/cluecode/data/ics/chromium-webkit-glue/webkit_strings.grd.yml
index 7d6662f12a..b9633c1633 100644
--- a/tests/cluecode/data/ics/chromium-webkit-glue/webkit_strings.grd.yml
+++ b/tests/cluecode/data/ics/chromium-webkit-glue/webkit_strings.grd.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: the Initial Developer
     count: 1
+allrights:
+  - Copyright (c) 2007 Apple Inc. All rights reserved.
+  - Portions created by the Initial Developer are Copyright (c) 2001 the Initial Developer. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/chromium/LICENSE.yml b/tests/cluecode/data/ics/chromium/LICENSE.yml
index 516f6c0097..e0322e9c79 100644
--- a/tests/cluecode/data/ics/chromium/LICENSE.yml
+++ b/tests/cluecode/data/ics/chromium/LICENSE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2010 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/clang/NOTICE.yml b/tests/cluecode/data/ics/clang/NOTICE.yml
index 503172ca06..26ecd59b43 100644
--- a/tests/cluecode/data/ics/clang/NOTICE.yml
+++ b/tests/cluecode/data/ics/clang/NOTICE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: University of Illinois at Urbana-Champaign
     count: 1
+allrights:
+  - Copyright (c) 2007-2011 University of Illinois at Urbana-Champaign. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dbus-dbus/dbus-hash.c.yml b/tests/cluecode/data/ics/dbus-dbus/dbus-hash.c.yml
index c9cebf6804..bbdf350150 100644
--- a/tests/cluecode/data/ics/dbus-dbus/dbus-hash.c.yml
+++ b/tests/cluecode/data/ics/dbus-dbus/dbus-hash.c.yml
@@ -26,3 +26,10 @@ holders_summary:
     count: 1
   - value: the Regents of the University of California, Sun Microsystems, Inc., Scriptics Corporation
     count: 1
+allrights:
+  - Copyright (c) 2002 Red Hat, Inc.
+  - Copyright (c) 1991-1993 The Regents of the University of California.
+  - Copyright (c) 1994 Sun Microsystems, Inc.
+  - Copyright (c) 1991-1993 The Regents of the University of California.
+  - Copyright (c) 1994 Sun Microsystems, Inc.
+  - copyrighted by the Regents of the University of California, Sun Microsystems, Inc., Scriptics Corporation
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dbus-dbus/dbus-md5.c.yml b/tests/cluecode/data/ics/dbus-dbus/dbus-md5.c.yml
index a39e7da1fc..cb0f423d73 100644
--- a/tests/cluecode/data/ics/dbus-dbus/dbus-md5.c.yml
+++ b/tests/cluecode/data/ics/dbus-dbus/dbus-md5.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Red Hat
     count: 1
+allrights:
+  - Copyright (c) 2003 Red Hat Inc.
+  - Copyright (c) 1999, 2000 Aladdin Enterprises. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dbus-doc/introspect.xsl.yml b/tests/cluecode/data/ics/dbus-doc/introspect.xsl.yml
index 15eca03bcc..bbb08e24f0 100644
--- a/tests/cluecode/data/ics/dbus-doc/introspect.xsl.yml
+++ b/tests/cluecode/data/ics/dbus-doc/introspect.xsl.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Lennart Poettering
     count: 1
+allrights:
+  - Copyright (c) 2005 Lennart Poettering.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dbus-tools/strtoll.c.yml b/tests/cluecode/data/ics/dbus-tools/strtoll.c.yml
index d4c419e5c1..14e3a035ec 100644
--- a/tests/cluecode/data/ics/dbus-tools/strtoll.c.yml
+++ b/tests/cluecode/data/ics/dbus-tools/strtoll.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1992, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dbus/COPYING.yml b/tests/cluecode/data/ics/dbus/COPYING.yml
index 01fd9b7216..f963a9c24d 100644
--- a/tests/cluecode/data/ics/dbus/COPYING.yml
+++ b/tests/cluecode/data/ics/dbus/COPYING.yml
@@ -15,3 +15,7 @@ holders_summary:
     count: 2
   - value: Lawrence E. Rosen
     count: 1
+allrights:
+  - Copyright (c) 2003-2004 Lawrence E. Rosen. All rights reserved.
+  - Copyright (c) 1989, 1991 Free Software Foundation, Inc.
+  - copyrighted by the Free Software Foundation
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dhcpcd-compat/linkaddr.c.yml b/tests/cluecode/data/ics/dhcpcd-compat/linkaddr.c.yml
index ac2ce5f06d..37d1992e17 100644
--- a/tests/cluecode/data/ics/dhcpcd-compat/linkaddr.c.yml
+++ b/tests/cluecode/data/ics/dhcpcd-compat/linkaddr.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1990, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dhcpcd/NOTICE.yml b/tests/cluecode/data/ics/dhcpcd/NOTICE.yml
index 6d1fe7d8ee..13ac7ddf6d 100644
--- a/tests/cluecode/data/ics/dhcpcd/NOTICE.yml
+++ b/tests/cluecode/data/ics/dhcpcd/NOTICE.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Roy Marples
     count: 1
+allrights:
+  - Copyright 2006-2008 Roy Marples <roy@marples.name> All rights reserved
+  - Copyright (c) 2004,2007 by Internet Systems Consortium, Inc.
+  - Copyright (c) 1996-2003 by Internet Software Consortium
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dhcpcd/arp.c.yml b/tests/cluecode/data/ics/dhcpcd/arp.c.yml
index e808dfe5a6..a899b55185 100644
--- a/tests/cluecode/data/ics/dhcpcd/arp.c.yml
+++ b/tests/cluecode/data/ics/dhcpcd/arp.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Roy Marples
     count: 1
+allrights:
+  - Copyright (c) 2006-2008 Roy Marples <roy@marples.name> All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dhcpcd/bind.c.yml b/tests/cluecode/data/ics/dhcpcd/bind.c.yml
index 39b1791f10..9f2e781268 100644
--- a/tests/cluecode/data/ics/dhcpcd/bind.c.yml
+++ b/tests/cluecode/data/ics/dhcpcd/bind.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Roy Marples
     count: 1
+allrights:
+  - Copyright (c) 2006-2010 Roy Marples <roy@marples.name> All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dhcpcd/client.c.yml b/tests/cluecode/data/ics/dhcpcd/client.c.yml
index 1112ee77d6..f9107877a0 100644
--- a/tests/cluecode/data/ics/dhcpcd/client.c.yml
+++ b/tests/cluecode/data/ics/dhcpcd/client.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Roy Marples
     count: 1
+allrights:
+  - Copyright 2006-2008 Roy Marples <roy@marples.name> All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dhcpcd/common.c.yml b/tests/cluecode/data/ics/dhcpcd/common.c.yml
index 95231da608..0184993386 100644
--- a/tests/cluecode/data/ics/dhcpcd/common.c.yml
+++ b/tests/cluecode/data/ics/dhcpcd/common.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Roy Marples
     count: 1
+allrights:
+  - Copyright (c) 2006-2009 Roy Marples <roy@marples.name> All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dhcpcd/dhcpcd.8.yml b/tests/cluecode/data/ics/dhcpcd/dhcpcd.8.yml
index 8c2f2e9f93..8c3dd4df57 100644
--- a/tests/cluecode/data/ics/dhcpcd/dhcpcd.8.yml
+++ b/tests/cluecode/data/ics/dhcpcd/dhcpcd.8.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Roy Marples
     count: 1
+allrights:
+  - Copyright (c) 2006-2010 Roy Marples All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dhcpcd/dhcpcd.c.yml b/tests/cluecode/data/ics/dhcpcd/dhcpcd.c.yml
index 7e5ea26359..185a4c9647 100644
--- a/tests/cluecode/data/ics/dhcpcd/dhcpcd.c.yml
+++ b/tests/cluecode/data/ics/dhcpcd/dhcpcd.c.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Roy Marples
     count: 2
+allrights:
+  - Copyright (c) 2006-2010 Roy Marples <roy@marples.name> All rights reserved
+  - Copyright (c) 2006-2010 Roy Marples
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dhcpcd/if-linux-wireless.c.yml b/tests/cluecode/data/ics/dhcpcd/if-linux-wireless.c.yml
index 4740c897fd..240273cfc4 100644
--- a/tests/cluecode/data/ics/dhcpcd/if-linux-wireless.c.yml
+++ b/tests/cluecode/data/ics/dhcpcd/if-linux-wireless.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Roy Marples
     count: 1
+allrights:
+  - Copyright (c) 2009-2010 Roy Marples <roy@marples.name> All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dnsmasq-src/nameser.h.yml b/tests/cluecode/data/ics/dnsmasq-src/nameser.h.yml
index 70902ff7a7..d149c31600 100644
--- a/tests/cluecode/data/ics/dnsmasq-src/nameser.h.yml
+++ b/tests/cluecode/data/ics/dnsmasq-src/nameser.h.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1983, 1989, 1993 The Regents of the University of California. All rights reserved.
+  - Portions Copyright (c) 1993 by Digital Equipment Corporation.
+  - Portions Copyright (c) 1995 by International Business Machines, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/doclava-src-com-google-doclava-parser/Java.g.yml b/tests/cluecode/data/ics/doclava-src-com-google-doclava-parser/Java.g.yml
index 407d71d0ac..de749764ba 100644
--- a/tests/cluecode/data/ics/doclava-src-com-google-doclava-parser/Java.g.yml
+++ b/tests/cluecode/data/ics/doclava-src-com-google-doclava-parser/Java.g.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Terence Parr
     count: 1
+allrights:
+  - Copyright (c) 2007-2008 Terence Parr All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear-libtommath-mtest/mpi.c.yml b/tests/cluecode/data/ics/dropbear-libtommath-mtest/mpi.c.yml
index 24d0c1763d..c232dd988b 100644
--- a/tests/cluecode/data/ics/dropbear-libtommath-mtest/mpi.c.yml
+++ b/tests/cluecode/data/ics/dropbear-libtommath-mtest/mpi.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Michael J. Fromberger
     count: 1
+allrights:
+  - Copyright (c) 1998 Michael J. Fromberger, All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear-libtommath-mtest/mpi.h.yml b/tests/cluecode/data/ics/dropbear-libtommath-mtest/mpi.h.yml
index 24d0c1763d..c232dd988b 100644
--- a/tests/cluecode/data/ics/dropbear-libtommath-mtest/mpi.h.yml
+++ b/tests/cluecode/data/ics/dropbear-libtommath-mtest/mpi.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Michael J. Fromberger
     count: 1
+allrights:
+  - Copyright (c) 1998 Michael J. Fromberger, All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/LICENSE.yml b/tests/cluecode/data/ics/dropbear/LICENSE.yml
index 93081feafc..4036cdfd92 100644
--- a/tests/cluecode/data/ics/dropbear/LICENSE.yml
+++ b/tests/cluecode/data/ics/dropbear/LICENSE.yml
@@ -34,3 +34,11 @@ holders_summary:
     count: 1
   - value: Todd C. Miller
     count: 1
+allrights:
+  - (c) 2004 Mihnea Stoenescu
+  - Copyright (c) 2002-2006 Matt Johnston
+  - Portions copyright (c) 2004 Mihnea Stoenescu All rights reserved.
+  - Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi> , Espoo, Finland All rights reserved
+  - (c) Todd C. Miller
+  - copyright 1997-2003 Simon Tatham.
+  - Portions copyright Robert de Bath, Joris van Rantwijk, Delian Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, Justin Bradford, and CORE SDI S.A.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/agentfwd.h.yml b/tests/cluecode/data/ics/dropbear/agentfwd.h.yml
index 924099e82f..26bb3ed8d6 100644
--- a/tests/cluecode/data/ics/dropbear/agentfwd.h.yml
+++ b/tests/cluecode/data/ics/dropbear/agentfwd.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Matt Johnston
     count: 1
+allrights:
+  - Copyright (c) 2002,2003 Matt Johnston All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/atomicio.c.yml b/tests/cluecode/data/ics/dropbear/atomicio.c.yml
index d7f89e7c93..d610fb3d37 100644
--- a/tests/cluecode/data/ics/dropbear/atomicio.c.yml
+++ b/tests/cluecode/data/ics/dropbear/atomicio.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Theo de Raadt
     count: 1
+allrights:
+  - Copyright (c) 1995,1999 Theo de Raadt. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/circbuffer.c.yml b/tests/cluecode/data/ics/dropbear/circbuffer.c.yml
index b9eb4ff6b2..be263abcb9 100644
--- a/tests/cluecode/data/ics/dropbear/circbuffer.c.yml
+++ b/tests/cluecode/data/ics/dropbear/circbuffer.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Matt Johnston
     count: 1
+allrights:
+  - Copyright (c) 2002-2004 Matt Johnston All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/cli-algo.c.yml b/tests/cluecode/data/ics/dropbear/cli-algo.c.yml
index 303fa452a8..b67cfe5490 100644
--- a/tests/cluecode/data/ics/dropbear/cli-algo.c.yml
+++ b/tests/cluecode/data/ics/dropbear/cli-algo.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Mihnea Stoenescu
     count: 1
+allrights:
+  - Copyright (c) 2002,2003 Matt Johnston
+  - Copyright (c) 2004 by Mihnea Stoenescu All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/cli-authinteract.c.yml b/tests/cluecode/data/ics/dropbear/cli-authinteract.c.yml
index f58dd96342..2af2c0ba75 100644
--- a/tests/cluecode/data/ics/dropbear/cli-authinteract.c.yml
+++ b/tests/cluecode/data/ics/dropbear/cli-authinteract.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Matt Johnston
     count: 1
+allrights:
+  - Copyright (c) 2005 Matt Johnston All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/cli-kex.c.yml b/tests/cluecode/data/ics/dropbear/cli-kex.c.yml
index bac579d235..7b65a147d7 100644
--- a/tests/cluecode/data/ics/dropbear/cli-kex.c.yml
+++ b/tests/cluecode/data/ics/dropbear/cli-kex.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Mihnea Stoenescu
     count: 1
+allrights:
+  - Copyright (c) 2002-2004 Matt Johnston
+  - Copyright (c) 2004 by Mihnea Stoenescu All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/common-kex.c.yml b/tests/cluecode/data/ics/dropbear/common-kex.c.yml
index ea4674c20b..48e0833f62 100644
--- a/tests/cluecode/data/ics/dropbear/common-kex.c.yml
+++ b/tests/cluecode/data/ics/dropbear/common-kex.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Mihnea Stoenescu
     count: 1
+allrights:
+  - Copyright (c) 2002-2004 Matt Johnston
+  - Portions Copyright (c) 2004 by Mihnea Stoenescu All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/compat.c.yml b/tests/cluecode/data/ics/dropbear/compat.c.yml
index 3e2a34c6c8..59866aabd9 100644
--- a/tests/cluecode/data/ics/dropbear/compat.c.yml
+++ b/tests/cluecode/data/ics/dropbear/compat.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Todd C. Miller
     count: 1
+allrights:
+  - Copyright (c) 2002,2003 Matt Johnston All rights reserved.
+  - Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> All rights reserved.
+  - Copyright (c) 1990, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/dbutil.c.yml b/tests/cluecode/data/ics/dropbear/dbutil.c.yml
index ddd8035e30..93e99db530 100644
--- a/tests/cluecode/data/ics/dropbear/dbutil.c.yml
+++ b/tests/cluecode/data/ics/dropbear/dbutil.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Todd C. Miller
     count: 1
+allrights:
+  - Copyright (c) 2002,2003 Matt Johnston All rights reserved.
+  - Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/fake-rfc2553.c.yml b/tests/cluecode/data/ics/dropbear/fake-rfc2553.c.yml
index 7cdb7a5121..c5a588136d 100644
--- a/tests/cluecode/data/ics/dropbear/fake-rfc2553.c.yml
+++ b/tests/cluecode/data/ics/dropbear/fake-rfc2553.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 2000-2003 Damien Miller. All rights reserved.
+  - Copyright (c) 1999 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/keyimport.c.yml b/tests/cluecode/data/ics/dropbear/keyimport.c.yml
index 80830ee953..bbd2998e7d 100644
--- a/tests/cluecode/data/ics/dropbear/keyimport.c.yml
+++ b/tests/cluecode/data/ics/dropbear/keyimport.c.yml
@@ -20,3 +20,7 @@ holders_summary:
     count: 1
   - value: Simon Tatham
     count: 1
+allrights:
+  - copyright 2003 Matt Johnston
+  - copyright 1997-2003 Simon Tatham.
+  - Portions copyright Robert de Bath, Joris van Rantwijk, Delian Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, Justin Bradford, and CORE SDI S.A.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/loginrec.c.yml b/tests/cluecode/data/ics/dropbear/loginrec.c.yml
index 68228ffb4f..07105afd5e 100644
--- a/tests/cluecode/data/ics/dropbear/loginrec.c.yml
+++ b/tests/cluecode/data/ics/dropbear/loginrec.c.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: Todd C. Miller
     count: 1
+allrights:
+  - Copyright (c) 2000 Andre Lucas. All rights reserved.
+  - Portions copyright (c) 1998 Todd C. Miller
+  - Portions copyright (c) 1996 Jason Downs
+  - Portions copyright (c) 1996 Theo de Raadt
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/loginrec.h.yml b/tests/cluecode/data/ics/dropbear/loginrec.h.yml
index 5195a048b8..3d11cd0f27 100644
--- a/tests/cluecode/data/ics/dropbear/loginrec.h.yml
+++ b/tests/cluecode/data/ics/dropbear/loginrec.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Andre Lucas
     count: 1
+allrights:
+  - Copyright (c) 2000 Andre Lucas. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/netbsd_getpass.c.yml b/tests/cluecode/data/ics/dropbear/netbsd_getpass.c.yml
index dafceefa8b..07c58d6d37 100644
--- a/tests/cluecode/data/ics/dropbear/netbsd_getpass.c.yml
+++ b/tests/cluecode/data/ics/dropbear/netbsd_getpass.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1988, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/progressmeter.c.yml b/tests/cluecode/data/ics/dropbear/progressmeter.c.yml
index bb89d815d3..63c022b360 100644
--- a/tests/cluecode/data/ics/dropbear/progressmeter.c.yml
+++ b/tests/cluecode/data/ics/dropbear/progressmeter.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Nils Nordman
     count: 1
+allrights:
+  - Copyright (c) 2003 Nils Nordman. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/progressmeter.h.yml b/tests/cluecode/data/ics/dropbear/progressmeter.h.yml
index a852277eae..5dfdc4893c 100644
--- a/tests/cluecode/data/ics/dropbear/progressmeter.h.yml
+++ b/tests/cluecode/data/ics/dropbear/progressmeter.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Nils Nordman
     count: 1
+allrights:
+  - Copyright (c) 2002 Nils Nordman. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/scp.c.yml b/tests/cluecode/data/ics/dropbear/scp.c.yml
index 03391a9e5a..8c56772f98 100644
--- a/tests/cluecode/data/ics/dropbear/scp.c.yml
+++ b/tests/cluecode/data/ics/dropbear/scp.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Theo de Raadt
     count: 1
+allrights:
+  - Copyright (c) 1999 Theo de Raadt. All rights reserved.
+  - Copyright (c) 1999 Aaron Campbell. All rights reserved.
+  - Copyright (c) 1983, 1990, 1992, 1993, 1995 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/scpmisc.c.yml b/tests/cluecode/data/ics/dropbear/scpmisc.c.yml
index 638e74ecb3..80cafce15d 100644
--- a/tests/cluecode/data/ics/dropbear/scpmisc.c.yml
+++ b/tests/cluecode/data/ics/dropbear/scpmisc.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Tatu Ylonen , Espoo, Finland
     count: 1
+allrights:
+  - Copyright (c) 2000 Markus Friedl. All rights reserved.
+  - Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi> , Espoo, Finland All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/scpmisc.h.yml b/tests/cluecode/data/ics/dropbear/scpmisc.h.yml
index 5b03863af6..53c31f6828 100644
--- a/tests/cluecode/data/ics/dropbear/scpmisc.h.yml
+++ b/tests/cluecode/data/ics/dropbear/scpmisc.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Tatu Ylonen , Espoo, Finland
     count: 1
+allrights:
+  - Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi> , Espoo, Finland All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/svr-authpam.c.yml b/tests/cluecode/data/ics/dropbear/svr-authpam.c.yml
index 9bc4c69aca..0ee400a470 100644
--- a/tests/cluecode/data/ics/dropbear/svr-authpam.c.yml
+++ b/tests/cluecode/data/ics/dropbear/svr-authpam.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Matt Johnston
     count: 1
+allrights:
+  - Copyright (c) 2004 Martin Carlsson
+  - Portions (c) 2004 Matt Johnston All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/dropbear/svr-main.c.yml b/tests/cluecode/data/ics/dropbear/svr-main.c.yml
index 7bb8fa69ce..873984f941 100644
--- a/tests/cluecode/data/ics/dropbear/svr-main.c.yml
+++ b/tests/cluecode/data/ics/dropbear/svr-main.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Matt Johnston
     count: 1
+allrights:
+  - Copyright (c) 2002-2006 Matt Johnston All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/emma-ant-ant14-com-vladium-emma/ANTMain.java.yml b/tests/cluecode/data/ics/emma-ant-ant14-com-vladium-emma/ANTMain.java.yml
index 06e7551906..de6aca32d6 100644
--- a/tests/cluecode/data/ics/emma-ant-ant14-com-vladium-emma/ANTMain.java.yml
+++ b/tests/cluecode/data/ics/emma-ant-ant14-com-vladium-emma/ANTMain.java.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Vladimir Roubtsov
     count: 1
+allrights:
+  - Copyright (c) 2003 Vladimir Roubtsov. All rights reserved.
+  - Vlad Roubtsov, (c) 2004
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/emma-ant-ant14-com-vladium-emma/emmajavaTask.java.yml b/tests/cluecode/data/ics/emma-ant-ant14-com-vladium-emma/emmajavaTask.java.yml
index 68fbac2004..17e5e7dcab 100644
--- a/tests/cluecode/data/ics/emma-ant-ant14-com-vladium-emma/emmajavaTask.java.yml
+++ b/tests/cluecode/data/ics/emma-ant-ant14-com-vladium-emma/emmajavaTask.java.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Vladimir Roubtsov
     count: 1
+allrights:
+  - Copyright (c) 2003 Vladimir Roubtsov. All rights reserved.
+  - Vlad Roubtsov, (c) 2003
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/emma-core-java12-com-vladium-emma-data/IMetadataConstants.java.yml b/tests/cluecode/data/ics/emma-core-java12-com-vladium-emma-data/IMetadataConstants.java.yml
index af240e424b..427ea5c18a 100644
--- a/tests/cluecode/data/ics/emma-core-java12-com-vladium-emma-data/IMetadataConstants.java.yml
+++ b/tests/cluecode/data/ics/emma-core-java12-com-vladium-emma-data/IMetadataConstants.java.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Vladimir Roubtsov
     count: 1
+allrights:
+  - Copyright (c) 2003 Vladimir Roubtsov. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/emma-core-java12-com-vladium-emma-report-lcov/ReportGenerator.java.yml b/tests/cluecode/data/ics/emma-core-java12-com-vladium-emma-report-lcov/ReportGenerator.java.yml
index c7ae1763ee..b8bed23582 100644
--- a/tests/cluecode/data/ics/emma-core-java12-com-vladium-emma-report-lcov/ReportGenerator.java.yml
+++ b/tests/cluecode/data/ics/emma-core-java12-com-vladium-emma-report-lcov/ReportGenerator.java.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: Vladimir Roubtsov
     count: 1
+allrights:
+  - Copyright 2009 Google Inc. All Rights Reserved.
+  - Copyright (c) 2003 Vladimir Roubtsov.
+  - Vlad Roubtsov, (c) 2003
+  - Tim Baverstock, (c) 2009
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/emma-core-java12-com-vladium-emma/IAppConstants.java.yml b/tests/cluecode/data/ics/emma-core-java12-com-vladium-emma/IAppConstants.java.yml
index 61a89a8ee0..1ab0fa8002 100644
--- a/tests/cluecode/data/ics/emma-core-java12-com-vladium-emma/IAppConstants.java.yml
+++ b/tests/cluecode/data/ics/emma-core-java12-com-vladium-emma/IAppConstants.java.yml
@@ -15,3 +15,7 @@ holders_summary:
     count: 2
   - value: Vlad Roubtsov
     count: 1
+allrights:
+  - Copyright (c) 2003 Vladimir Roubtsov. All rights reserved.
+  - Vlad Roubtsov, (c) 2003
+  - (c) Vladimir Roubtsov
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/emma-core-java12-com-vladium-emma/Processor.java.yml b/tests/cluecode/data/ics/emma-core-java12-com-vladium-emma/Processor.java.yml
index 23b0f8cb89..d61867753b 100644
--- a/tests/cluecode/data/ics/emma-core-java12-com-vladium-emma/Processor.java.yml
+++ b/tests/cluecode/data/ics/emma-core-java12-com-vladium-emma/Processor.java.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Vladimir Roubtsov
     count: 1
+allrights:
+  - Copyright (c) 2004 Vladimir Roubtsov. All rights reserved.
+  - Vlad Roubtsov, (c) 2004
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/emma-core-java12-com-vladium-jcd-cls/AbstractClassDefVisitor.java.yml b/tests/cluecode/data/ics/emma-core-java12-com-vladium-jcd-cls/AbstractClassDefVisitor.java.yml
index e3ef79bf6d..b676408ca5 100644
--- a/tests/cluecode/data/ics/emma-core-java12-com-vladium-jcd-cls/AbstractClassDefVisitor.java.yml
+++ b/tests/cluecode/data/ics/emma-core-java12-com-vladium-jcd-cls/AbstractClassDefVisitor.java.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Vladimir Roubtsov
     count: 1
+allrights:
+  - Copyright (c) 2003 Vladimir Roubtsov. All rights reserved.
+  - (c) 2001, Vlad Roubtsov
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/emma-core-java12-com-vladium-jcd-cls/ConstantCollection.java.yml b/tests/cluecode/data/ics/emma-core-java12-com-vladium-jcd-cls/ConstantCollection.java.yml
index 45f5fc4a95..8f9e2bbeac 100644
--- a/tests/cluecode/data/ics/emma-core-java12-com-vladium-jcd-cls/ConstantCollection.java.yml
+++ b/tests/cluecode/data/ics/emma-core-java12-com-vladium-jcd-cls/ConstantCollection.java.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Vladimir Roubtsov
     count: 2
+allrights:
+  - Copyright (c) 2003 Vladimir Roubtsov. All rights reserved.
+  - (c) 2001, Vladimir Roubtsov
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/emma-core-java12-com-vladium-logging/ILogLevels.java.yml b/tests/cluecode/data/ics/emma-core-java12-com-vladium-logging/ILogLevels.java.yml
index 4deff833a2..3317aa3ec4 100644
--- a/tests/cluecode/data/ics/emma-core-java12-com-vladium-logging/ILogLevels.java.yml
+++ b/tests/cluecode/data/ics/emma-core-java12-com-vladium-logging/ILogLevels.java.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Vladimir Roubtsov
     count: 1
+allrights:
+  - Copyright (c) 2003 Vladimir Roubtsov. All rights reserved.
+  - Vlad Roubtsov, (c) 2001
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/emma-core-java12-com-vladium-util/SoftValueMap.java.yml b/tests/cluecode/data/ics/emma-core-java12-com-vladium-util/SoftValueMap.java.yml
index 8964d6c2e2..6a39ac7fa9 100644
--- a/tests/cluecode/data/ics/emma-core-java12-com-vladium-util/SoftValueMap.java.yml
+++ b/tests/cluecode/data/ics/emma-core-java12-com-vladium-util/SoftValueMap.java.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Vladimir Roubtsov
     count: 1
+allrights:
+  - Copyright (c) 2003 Vladimir Roubtsov. All rights reserved.
+  - (c) 2002, Vlad Roubtsov
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/emma-core-java12-com-vladium-util/WCMatcher.java.yml b/tests/cluecode/data/ics/emma-core-java12-com-vladium-util/WCMatcher.java.yml
index bc62b7bce1..45874a06b1 100644
--- a/tests/cluecode/data/ics/emma-core-java12-com-vladium-util/WCMatcher.java.yml
+++ b/tests/cluecode/data/ics/emma-core-java12-com-vladium-util/WCMatcher.java.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Vladimir Roubtsov
     count: 1
+allrights:
+  - Copyright (c) 2003 Vladimir Roubtsov. All rights reserved.
+  - Vlad Roubtsov, (c) 2002
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/emma/BUILD.txt.yml b/tests/cluecode/data/ics/emma/BUILD.txt.yml
index 0ac5a90014..b9837203ea 100644
--- a/tests/cluecode/data/ics/emma/BUILD.txt.yml
+++ b/tests/cluecode/data/ics/emma/BUILD.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Vlad Roubtsov
     count: 1
+allrights:
+  - Copyright (c) 2003-2004 Vlad Roubtsov. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/emma/test.sh.yml b/tests/cluecode/data/ics/emma/test.sh.yml
index 42804137f6..51963e7b35 100644
--- a/tests/cluecode/data/ics/emma/test.sh.yml
+++ b/tests/cluecode/data/ics/emma/test.sh.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2009 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/expat-amiga/expat_lib.c.yml b/tests/cluecode/data/ics/expat-amiga/expat_lib.c.yml
index 3989e6fc34..998f1402f5 100644
--- a/tests/cluecode/data/ics/expat-amiga/expat_lib.c.yml
+++ b/tests/cluecode/data/ics/expat-amiga/expat_lib.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Expat maintainers
     count: 1
+allrights:
+  - Copyright (c) 2001-2007 Expat maintainers.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/expat-conftools/ltmain.sh.yml b/tests/cluecode/data/ics/expat-conftools/ltmain.sh.yml
index c1e1af769f..38822ab5e6 100644
--- a/tests/cluecode/data/ics/expat-conftools/ltmain.sh.yml
+++ b/tests/cluecode/data/ics/expat-conftools/ltmain.sh.yml
@@ -5,10 +5,13 @@ what:
 copyrights:
   - Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation,
     Inc.
-  - Copyright (c) 2005 Free Software Foundation, Inc
+  - Copyright (c) 2005 Free Software Foundation, Inc.
 holders:
   - Free Software Foundation, Inc.
-  - Free Software Foundation, Inc
+  - Free Software Foundation, Inc.
 holders_summary:
   - value: Free Software Foundation
     count: 2
+allrights:
+  - Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+  - Copyright (c) 2005 Free Software Foundation, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/expat-doc/reference.html.yml b/tests/cluecode/data/ics/expat-doc/reference.html.yml
index 8b421e1a4e..8acbe4f2df 100644
--- a/tests/cluecode/data/ics/expat-doc/reference.html.yml
+++ b/tests/cluecode/data/ics/expat-doc/reference.html.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Clark Cooper
     count: 1
+allrights:
+  - Copyright 1999,2000 Clark Cooper <coopercc@netheaven.com> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/expat-examples/outline.c.yml b/tests/cluecode/data/ics/expat-examples/outline.c.yml
index 9851d22249..7722376012 100644
--- a/tests/cluecode/data/ics/expat-examples/outline.c.yml
+++ b/tests/cluecode/data/ics/expat-examples/outline.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Clark Cooper
     count: 1
+allrights:
+  - Copyright 1999, Clark Cooper All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/expat-lib/macconfig.h.yml b/tests/cluecode/data/ics/expat-lib/macconfig.h.yml
index 8b63c5d98c..d5c70b71d1 100644
--- a/tests/cluecode/data/ics/expat-lib/macconfig.h.yml
+++ b/tests/cluecode/data/ics/expat-lib/macconfig.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Clark Cooper
     count: 1
+allrights:
+  - Copyright 2000, Clark Cooper All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/expat/NOTICE.yml b/tests/cluecode/data/ics/expat/NOTICE.yml
index df6143db73..d084d3ad47 100644
--- a/tests/cluecode/data/ics/expat/NOTICE.yml
+++ b/tests/cluecode/data/ics/expat/NOTICE.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Thai Open Source Software Center Ltd and Clark Cooper
     count: 1
+allrights:
+  - Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper
+  - Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/fdlibm/NOTICE.yml b/tests/cluecode/data/ics/fdlibm/NOTICE.yml
index b71748a147..a8c66e1eeb 100644
--- a/tests/cluecode/data/ics/fdlibm/NOTICE.yml
+++ b/tests/cluecode/data/ics/fdlibm/NOTICE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Sun Microsystems
     count: 1
+allrights:
+  - Copyright (c) 1993 by Sun Microsystems, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/fdlibm/e_acos.c.yml b/tests/cluecode/data/ics/fdlibm/e_acos.c.yml
index b71748a147..a8c66e1eeb 100644
--- a/tests/cluecode/data/ics/fdlibm/e_acos.c.yml
+++ b/tests/cluecode/data/ics/fdlibm/e_acos.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Sun Microsystems
     count: 1
+allrights:
+  - Copyright (c) 1993 by Sun Microsystems, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/fdlibm/e_exp.c.yml b/tests/cluecode/data/ics/fdlibm/e_exp.c.yml
index 26e9068369..1c3e444280 100644
--- a/tests/cluecode/data/ics/fdlibm/e_exp.c.yml
+++ b/tests/cluecode/data/ics/fdlibm/e_exp.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Sun Microsystems
     count: 1
+allrights:
+  - Copyright (c) 2004 by Sun Microsystems, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/fdlibm/k_tan.c.yml b/tests/cluecode/data/ics/fdlibm/k_tan.c.yml
index a95722c00f..9094533136 100644
--- a/tests/cluecode/data/ics/fdlibm/k_tan.c.yml
+++ b/tests/cluecode/data/ics/fdlibm/k_tan.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Sun Microsystems
     count: 1
+allrights:
+  - Copyright 2004 Sun Microsystems, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/fdlibm/makefile.in.yml b/tests/cluecode/data/ics/fdlibm/makefile.in.yml
index b71748a147..a8c66e1eeb 100644
--- a/tests/cluecode/data/ics/fdlibm/makefile.in.yml
+++ b/tests/cluecode/data/ics/fdlibm/makefile.in.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Sun Microsystems
     count: 1
+allrights:
+  - Copyright (c) 1993 by Sun Microsystems, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-builds/ft2unix.h.yml b/tests/cluecode/data/ics/freetype-builds/ft2unix.h.yml
index 1f4bbcbca7..87e1e1646a 100644
--- a/tests/cluecode/data/ics/freetype-builds/ft2unix.h.yml
+++ b/tests/cluecode/data/ics/freetype-builds/ft2unix.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2003, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-config/ftconfig.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-config/ftconfig.h.yml
index 59a3e06ff6..91cc70d8c4 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-config/ftconfig.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-config/ftconfig.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2004, 2006-2008, 2010-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-config/ftstdlib.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-config/ftstdlib.h.yml
index 7601d90d7e..54bbf9c25e 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-config/ftstdlib.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-config/ftstdlib.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2009 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svbdf.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svbdf.h.yml
index 94ca619ef3..05a87e8de9 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svbdf.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svbdf.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2003 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svcid.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svcid.h.yml
index 462002c667..c4d8fb72ac 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svcid.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svcid.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Derek Clegg, Michael Toftdal
     count: 1
+allrights:
+  - Copyright 2007, 2009 by Derek Clegg, Michael Toftdal.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svgxval.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svgxval.h.yml
index 784a09d56d..4f2fde5c62 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svgxval.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svgxval.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Masatake YAMATO, Red Hat K.K., David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2004, 2005 by Masatake YAMATO, Red Hat K.K., David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svkern.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svkern.h.yml
index ba6f1a07b4..279579c592 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svkern.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svkern.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2006 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svmm.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svmm.h.yml
index 33f8736fd7..01e86969d3 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svmm.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svmm.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2003, 2004 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svpostnm.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svpostnm.h.yml
index 70be23bdae..cc9b06b158 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svpostnm.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svpostnm.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2003, 2007 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svpsinfo.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svpsinfo.h.yml
index 0af95185f6..7ff6f0a40d 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svpsinfo.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svpsinfo.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2003, 2004, 2009 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svttcmap.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svttcmap.h.yml
index eb87e901a8..5f5bd4e751 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svttcmap.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svttcmap.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Masatake YAMATO, Redhat K.K.
     count: 1
+allrights:
+  - Copyright 2003 by Masatake YAMATO, Redhat K.K.
+  - Copyright 2003, 2008 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svttglyf.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svttglyf.h.yml
index a32896ec15..d133c7031d 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svttglyf.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal-services/svttglyf.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner
     count: 1
+allrights:
+  - Copyright 2007 by David Turner.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal/autohint.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal/autohint.h.yml
index e91d797837..96f92cef06 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal/autohint.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal/autohint.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2007 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal/ftcalc.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal/ftcalc.h.yml
index a72970868d..ab0c107922 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal/ftcalc.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal/ftcalc.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal/ftdebug.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal/ftdebug.h.yml
index 530328d824..86f4dfca4f 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal/ftdebug.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal/ftdebug.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2004, 2006, 2007, 2008, 2009 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal/ftdriver.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal/ftdriver.h.yml
index 1fde316634..49fd520633 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal/ftdriver.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal/ftdriver.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2006, 2008 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal/ftobjs.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal/ftobjs.h.yml
index 1a63f03bf9..dfc9500ac1 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal/ftobjs.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal/ftobjs.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2008, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal/ftpic.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal/ftpic.h.yml
index 308502b5b5..2e91809b91 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal/ftpic.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal/ftpic.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Oran Agra and Mickey Gabel
     count: 1
+allrights:
+  - Copyright 2009 by Oran Agra and Mickey Gabel.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal/ftserv.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal/ftserv.h.yml
index 1e2f5ae771..5c1c9b426b 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal/ftserv.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal/ftserv.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2003, 2004, 2005, 2006, 2007 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal/ftstream.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal/ftstream.h.yml
index 3f7492ad76..d52a34b17b 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal/ftstream.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal/ftstream.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2002, 2004-2006, 2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal/fttrace.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal/fttrace.h.yml
index 86f35dbe1a..e217f0f640 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal/fttrace.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal/fttrace.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2002, 2004-2007, 2009, 2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal/ftvalid.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal/ftvalid.h.yml
index 29fe027d2b..691c3333a2 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal/ftvalid.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal/ftvalid.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2004 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal/internal.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal/internal.h.yml
index c35f6e0237..f9f3917750 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal/internal.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal/internal.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2004 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal/pshints.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal/pshints.h.yml
index ff91917127..37a32c4c02 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal/pshints.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal/pshints.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2001, 2002, 2003, 2005, 2006, 2007, 2009 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal/sfnt.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal/sfnt.h.yml
index db6feedd9e..e752bae966 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal/sfnt.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal/sfnt.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype-internal/tttypes.h.yml b/tests/cluecode/data/ics/freetype-include-freetype-internal/tttypes.h.yml
index 22d9819f7a..4c529f2091 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype-internal/tttypes.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype-internal/tttypes.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2004, 2005, 2006, 2007, 2008 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/freetype.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/freetype.h.yml
index edf32a672b..bce9ebfc41 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/freetype.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/freetype.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftadvanc.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftadvanc.h.yml
index 18c9ff7e3b..1ffb003229 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftadvanc.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftadvanc.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2008 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftbbox.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftbbox.h.yml
index 6c49044e7d..3fabd524d2 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftbbox.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftbbox.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2003, 2007, 2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftbdf.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftbdf.h.yml
index 8af5b37cb1..d50f3d862a 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftbdf.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftbdf.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2002, 2003, 2004, 2006, 2009 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftbitmap.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftbitmap.h.yml
index a61bc0762d..f6eb9c69e8 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftbitmap.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftbitmap.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2004, 2005, 2006, 2008 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftcache.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftcache.h.yml
index fe90458c72..a61bf0220e 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftcache.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftcache.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftcid.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftcid.h.yml
index 41fd69daf7..bde975b601 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftcid.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftcid.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Dereg Clegg, Michael Toftdal
     count: 1
+allrights:
+  - Copyright 2007, 2009 by Dereg Clegg, Michael Toftdal.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/fterrdef.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/fterrdef.h.yml
index 4d339b7fed..a45043f4c6 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/fterrdef.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/fterrdef.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2002, 2004, 2006, 2007, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/fterrors.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/fterrors.h.yml
index 25495f2ad9..f271002e94 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/fterrors.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/fterrors.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2004, 2007 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftgasp.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftgasp.h.yml
index 57a754fa4d..ca0714bf76 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftgasp.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftgasp.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2007, 2008, 2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftglyph.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftglyph.h.yml
index f1c0831f02..85400f50d3 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftglyph.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftglyph.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2003, 2006, 2008, 2009, 2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftgxval.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftgxval.h.yml
index 9ce13e16e0..2ca8936ced 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftgxval.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftgxval.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Masatake YAMATO, Redhat K.K, David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2004, 2005, 2006 by Masatake YAMATO, Redhat K.K, David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftgzip.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftgzip.h.yml
index f0200b732c..9b95a1eaba 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftgzip.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftgzip.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2002, 2003, 2004, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftimage.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftimage.h.yml
index 8c2a5941e7..ed6c4c71ef 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftimage.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftimage.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftincrem.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftincrem.h.yml
index 9e32168f59..b9dbe0039f 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftincrem.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftincrem.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2002, 2003, 2006, 2007, 2008, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftlcdfil.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftlcdfil.h.yml
index a2a5756c27..0d25f3fdb6 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftlcdfil.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftlcdfil.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2006, 2007, 2008, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftlist.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftlist.h.yml
index 80724ab95d..8dac3e3ad6 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftlist.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftlist.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2003, 2007, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftlzw.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftlzw.h.yml
index 133be04b01..0437bd56d8 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftlzw.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftlzw.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2004, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftmac.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftmac.h.yml
index 366e08db25..2f81382bfc 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftmac.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftmac.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2004, 2006, 2007 by Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftmm.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftmm.h.yml
index e5bc0db0e1..780ff49eed 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftmm.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftmm.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2003, 2004, 2006, 2009 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftmodapi.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftmodapi.h.yml
index eb9bbb8ec9..bed9f23419 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftmodapi.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftmodapi.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2006, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftmoderr.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftmoderr.h.yml
index 1cfc5fd732..7e23a11524 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftmoderr.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftmoderr.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2001, 2002, 2003, 2004, 2005, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftotval.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftotval.h.yml
index f466a41fc3..1893fff1bf 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftotval.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftotval.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2004, 2005, 2006, 2007 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftoutln.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftoutln.h.yml
index f51ea9fb51..bdf8fb1814 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftoutln.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftoutln.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2003, 2005-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftpfr.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftpfr.h.yml
index 29c5bafc7c..75ca660d87 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftpfr.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftpfr.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2002, 2003, 2004, 2006, 2008, 2009 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftrender.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftrender.h.yml
index c6842de4c8..fb3a465167 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftrender.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftrender.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2005, 2006, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftsnames.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftsnames.h.yml
index 55bab344dc..6169d79ddc 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftsnames.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftsnames.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2006, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftstroke.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftstroke.h.yml
index 6d10d332e7..00fe73768c 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftstroke.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftstroke.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2002-2006, 2008, 2009, 2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftsynth.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftsynth.h.yml
index 22d3fdaadb..3e74228ddc 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftsynth.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftsynth.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2000-2001, 2003, 2006, 2008 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftsystem.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftsystem.h.yml
index 9abd7a6b1e..dd27fe449a 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftsystem.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftsystem.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2005, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/fttrigon.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/fttrigon.h.yml
index 02b2a6dbc9..401d66113a 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/fttrigon.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/fttrigon.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2001, 2003, 2005, 2007 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/fttypes.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/fttypes.h.yml
index da2fabdf7d..0ab3aa45c9 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/fttypes.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/fttypes.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2004, 2006, 2007, 2008 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftwinfnt.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftwinfnt.h.yml
index be0efa2633..a8788896ec 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftwinfnt.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftwinfnt.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2003, 2004, 2008 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ftxf86.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ftxf86.h.yml
index 5f59b9d3a4..c89d412876 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ftxf86.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ftxf86.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2002, 2003, 2004, 2006, 2007 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/t1tables.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/t1tables.h.yml
index 338649d8cd..c90c8eb882 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/t1tables.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/t1tables.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2004, 2006, 2008, 2009 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ttnameid.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ttnameid.h.yml
index a96811ff9c..ed8d02bc02 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ttnameid.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ttnameid.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2002, 2003, 2004, 2006, 2007, 2008 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/tttables.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/tttables.h.yml
index 4ae29eb57a..e2e6783a06 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/tttables.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/tttables.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2005, 2008-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/tttags.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/tttags.h.yml
index 87882df816..49652567dc 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/tttags.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/tttags.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2004, 2005, 2007, 2008 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include-freetype/ttunpat.h.yml b/tests/cluecode/data/ics/freetype-include-freetype/ttunpat.h.yml
index 5f8ca73a8b..f58c0e76d9 100644
--- a/tests/cluecode/data/ics/freetype-include-freetype/ttunpat.h.yml
+++ b/tests/cluecode/data/ics/freetype-include-freetype/ttunpat.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2003, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-include/ft2build.h.yml b/tests/cluecode/data/ics/freetype-include/ft2build.h.yml
index f5d0449b88..851b3da286 100644
--- a/tests/cluecode/data/ics/freetype-include/ft2build.h.yml
+++ b/tests/cluecode/data/ics/freetype-include/ft2build.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-autofit/afangles.c.yml b/tests/cluecode/data/ics/freetype-src-autofit/afangles.c.yml
index 2bda06ee00..47b845b300 100644
--- a/tests/cluecode/data/ics/freetype-src-autofit/afangles.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-autofit/afangles.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2003-2006, 2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-autofit/afcjk.c.yml b/tests/cluecode/data/ics/freetype-src-autofit/afcjk.c.yml
index f1e1489225..a9bf799a7e 100644
--- a/tests/cluecode/data/ics/freetype-src-autofit/afcjk.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-autofit/afcjk.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2006-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-autofit/afcjk.h.yml b/tests/cluecode/data/ics/freetype-src-autofit/afcjk.h.yml
index 0f57b12d75..3b528e8592 100644
--- a/tests/cluecode/data/ics/freetype-src-autofit/afcjk.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-autofit/afcjk.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2006, 2007, 2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-autofit/afdummy.c.yml b/tests/cluecode/data/ics/freetype-src-autofit/afdummy.c.yml
index d3ecc697b4..56b6abe403 100644
--- a/tests/cluecode/data/ics/freetype-src-autofit/afdummy.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-autofit/afdummy.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2003-2005, 2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-autofit/aferrors.h.yml b/tests/cluecode/data/ics/freetype-src-autofit/aferrors.h.yml
index 821678773f..39b9e367d3 100644
--- a/tests/cluecode/data/ics/freetype-src-autofit/aferrors.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-autofit/aferrors.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2005 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-autofit/afglobal.c.yml b/tests/cluecode/data/ics/freetype-src-autofit/afglobal.c.yml
index c46ce19517..9216d48c22 100644
--- a/tests/cluecode/data/ics/freetype-src-autofit/afglobal.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-autofit/afglobal.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2003-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-autofit/afglobal.h.yml b/tests/cluecode/data/ics/freetype-src-autofit/afglobal.h.yml
index 8be572a944..077e8a6a1f 100644
--- a/tests/cluecode/data/ics/freetype-src-autofit/afglobal.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-autofit/afglobal.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2003-2005, 2007, 2009, 2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-autofit/afhints.c.yml b/tests/cluecode/data/ics/freetype-src-autofit/afhints.c.yml
index 0022da2b99..ebb5b722bb 100644
--- a/tests/cluecode/data/ics/freetype-src-autofit/afhints.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-autofit/afhints.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2003-2007, 2009-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-autofit/afhints.h.yml b/tests/cluecode/data/ics/freetype-src-autofit/afhints.h.yml
index d0be48099f..264b697a2c 100644
--- a/tests/cluecode/data/ics/freetype-src-autofit/afhints.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-autofit/afhints.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2003-2008, 2010-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-autofit/aflatin.h.yml b/tests/cluecode/data/ics/freetype-src-autofit/aflatin.h.yml
index 435fd878d4..7b715550cd 100644
--- a/tests/cluecode/data/ics/freetype-src-autofit/aflatin.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-autofit/aflatin.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2003-2007, 2009, 2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-autofit/afloader.c.yml b/tests/cluecode/data/ics/freetype-src-autofit/afloader.c.yml
index 6570407b0e..f6eb52bbcc 100644
--- a/tests/cluecode/data/ics/freetype-src-autofit/afloader.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-autofit/afloader.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2003-2009, 2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-autofit/afmodule.c.yml b/tests/cluecode/data/ics/freetype-src-autofit/afmodule.c.yml
index 6f7198b4b5..37c2900d20 100644
--- a/tests/cluecode/data/ics/freetype-src-autofit/afmodule.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-autofit/afmodule.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2003-2006, 2009, 2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-autofit/afmodule.h.yml b/tests/cluecode/data/ics/freetype-src-autofit/afmodule.h.yml
index 6c1fa374cd..ba7b4ff9e8 100644
--- a/tests/cluecode/data/ics/freetype-src-autofit/afmodule.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-autofit/afmodule.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2003, 2004, 2005 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-autofit/afpic.c.yml b/tests/cluecode/data/ics/freetype-src-autofit/afpic.c.yml
index b2c57c7bd7..ce802a0673 100644
--- a/tests/cluecode/data/ics/freetype-src-autofit/afpic.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-autofit/afpic.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Oran Agra and Mickey Gabel
     count: 1
+allrights:
+  - Copyright 2009, 2010, 2011 by Oran Agra and Mickey Gabel.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-autofit/afpic.h.yml b/tests/cluecode/data/ics/freetype-src-autofit/afpic.h.yml
index cd32d103df..2259997eee 100644
--- a/tests/cluecode/data/ics/freetype-src-autofit/afpic.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-autofit/afpic.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Oran Agra and Mickey Gabel
     count: 1
+allrights:
+  - Copyright 2009, 2011 by Oran Agra and Mickey Gabel.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-autofit/afwarp.h.yml b/tests/cluecode/data/ics/freetype-src-autofit/afwarp.h.yml
index ed32d46ebe..2ca14f17e7 100644
--- a/tests/cluecode/data/ics/freetype-src-autofit/afwarp.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-autofit/afwarp.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2006, 2007 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-autofit/autofit.c.yml b/tests/cluecode/data/ics/freetype-src-autofit/autofit.c.yml
index eeacc52c38..a04947dca8 100644
--- a/tests/cluecode/data/ics/freetype-src-autofit/autofit.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-autofit/autofit.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2003-2007, 2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftadvanc.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftadvanc.c.yml
index 56e185f7a8..e25ee68b69 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftadvanc.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftadvanc.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2008, 2009 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftapi.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftapi.c.yml
index 5fe2cd6ec4..4d6dcaac61 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftapi.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftapi.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2002 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftbase.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftbase.c.yml
index 0213c418e4..826f3628bd 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftbase.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftbase.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftbase.h.yml b/tests/cluecode/data/ics/freetype-src-base/ftbase.h.yml
index bad7f993ab..0d9cbc2796 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftbase.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftbase.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, Werner Lemberg, and suzuki toshiya
     count: 1
+allrights:
+  - Copyright 2008, 2010 by David Turner, Robert Wilhelm, Werner Lemberg, and suzuki toshiya.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftbbox.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftbbox.c.yml
index aa30941c5a..4531989aa2 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftbbox.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftbbox.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2004, 2006, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftbitmap.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftbitmap.c.yml
index 870285b89b..eaba4481c8 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftbitmap.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftbitmap.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2004, 2005, 2006, 2007, 2008, 2009 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftcalc.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftcalc.c.yml
index 4380f2eb39..773d166e39 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftcalc.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftcalc.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2008 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftdbgmem.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftdbgmem.c.yml
index f0a70ed72e..009d013f73 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftdbgmem.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftdbgmem.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2009 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftdebug.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftdebug.c.yml
index 1cb17cb3a2..cd90541177 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftdebug.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftdebug.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2004, 2008 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftglyph.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftglyph.c.yml
index 13573fee6a..3007efc052 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftglyph.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftglyph.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2004, 2005, 2007, 2008, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftinit.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftinit.c.yml
index d946379b54..b09ab89668 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftinit.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftinit.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2005, 2007, 2009 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftlcdfil.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftlcdfil.c.yml
index 56a1709522..b17f022947 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftlcdfil.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftlcdfil.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2006, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftmm.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftmm.c.yml
index 02f069103f..2d5b70b042 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftmm.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftmm.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2003, 2004, 2009 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftobjs.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftobjs.c.yml
index edf32a672b..bce9ebfc41 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftobjs.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftobjs.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftpatent.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftpatent.c.yml
index c036b7066c..5d4df305c7 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftpatent.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftpatent.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner
     count: 1
+allrights:
+  - Copyright 2007, 2008, 2010 by David Turner.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftsnames.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftsnames.c.yml
index db3ca4d98f..ce310ccaf9 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftsnames.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftsnames.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2009 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftstream.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftstream.c.yml
index 11aba55c25..0b9fcb57fb 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftstream.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftstream.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2000-2002, 2004-2006, 2008-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftstroke.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftstroke.c.yml
index 10ba49de43..6a8cf609e2 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftstroke.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftstroke.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2002-2006, 2008-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftsynth.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftsynth.c.yml
index 1953fb2ea8..0d0ae8e165 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftsynth.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftsynth.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftsystem.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftsystem.c.yml
index cc609f2b38..70e81450f1 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftsystem.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftsystem.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2002, 2006, 2008-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/fttrigon.c.yml b/tests/cluecode/data/ics/freetype-src-base/fttrigon.c.yml
index 3fc7c429eb..549f3950dc 100644
--- a/tests/cluecode/data/ics/freetype-src-base/fttrigon.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/fttrigon.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2001, 2002, 2003, 2004, 2005 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftutil.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftutil.c.yml
index 3ab0076854..b3344f7983 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftutil.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftutil.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2002, 2004, 2005, 2006, 2007 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-base/ftxf86.c.yml b/tests/cluecode/data/ics/freetype-src-base/ftxf86.c.yml
index 504adae1e0..c050bfc1d7 100644
--- a/tests/cluecode/data/ics/freetype-src-base/ftxf86.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-base/ftxf86.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2002, 2003, 2004 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-cff/cff.c.yml b/tests/cluecode/data/ics/freetype-src-cff/cff.c.yml
index 56dbb7e145..0d54873af9 100644
--- a/tests/cluecode/data/ics/freetype-src-cff/cff.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-cff/cff.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-cff/cffcmap.c.yml b/tests/cluecode/data/ics/freetype-src-cff/cffcmap.c.yml
index 655c637bf9..8e7ba0469f 100644
--- a/tests/cluecode/data/ics/freetype-src-cff/cffcmap.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-cff/cffcmap.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-cff/cffcmap.h.yml b/tests/cluecode/data/ics/freetype-src-cff/cffcmap.h.yml
index 6969b77f1f..a67935e0db 100644
--- a/tests/cluecode/data/ics/freetype-src-cff/cffcmap.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-cff/cffcmap.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2002, 2003, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-cff/cfferrs.h.yml b/tests/cluecode/data/ics/freetype-src-cff/cfferrs.h.yml
index 582ebe1749..497dc38299 100644
--- a/tests/cluecode/data/ics/freetype-src-cff/cfferrs.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-cff/cfferrs.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2001 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-cff/cffload.c.yml b/tests/cluecode/data/ics/freetype-src-cff/cffload.c.yml
index 8c2a5941e7..ed6c4c71ef 100644
--- a/tests/cluecode/data/ics/freetype-src-cff/cffload.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-cff/cffload.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-cff/cffload.h.yml b/tests/cluecode/data/ics/freetype-src-cff/cffload.h.yml
index 7e75e9f1ea..db169b930f 100644
--- a/tests/cluecode/data/ics/freetype-src-cff/cffload.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-cff/cffload.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2007, 2008, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-cff/cffobjs.h.yml b/tests/cluecode/data/ics/freetype-src-cff/cffobjs.h.yml
index 4e14530e00..f526dc2905 100644
--- a/tests/cluecode/data/ics/freetype-src-cff/cffobjs.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-cff/cffobjs.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2004, 2006, 2007, 2008 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-cff/cffparse.c.yml b/tests/cluecode/data/ics/freetype-src-cff/cffparse.c.yml
index 53bfd03a65..bdea285da1 100644
--- a/tests/cluecode/data/ics/freetype-src-cff/cffparse.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-cff/cffparse.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2004, 2007-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-cff/cffparse.h.yml b/tests/cluecode/data/ics/freetype-src-cff/cffparse.h.yml
index 28feb0306b..b689598c88 100644
--- a/tests/cluecode/data/ics/freetype-src-cff/cffparse.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-cff/cffparse.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-cff/cffpic.c.yml b/tests/cluecode/data/ics/freetype-src-cff/cffpic.c.yml
index c88457c381..5987956b1a 100644
--- a/tests/cluecode/data/ics/freetype-src-cff/cffpic.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-cff/cffpic.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Oran Agra and Mickey Gabel
     count: 1
+allrights:
+  - Copyright 2009, 2010 by Oran Agra and Mickey Gabel.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-cff/cfftypes.h.yml b/tests/cluecode/data/ics/freetype-src-cff/cfftypes.h.yml
index f17df7515c..fdf42537cb 100644
--- a/tests/cluecode/data/ics/freetype-src-cff/cfftypes.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-cff/cfftypes.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2003, 2006-2008, 2010-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-psaux/afmparse.c.yml b/tests/cluecode/data/ics/freetype-src-psaux/afmparse.c.yml
index 77af1bbe8c..6722859310 100644
--- a/tests/cluecode/data/ics/freetype-src-psaux/afmparse.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-psaux/afmparse.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-psaux/psaux.c.yml b/tests/cluecode/data/ics/freetype-src-psaux/psaux.c.yml
index 4001d25403..260feb4e24 100644
--- a/tests/cluecode/data/ics/freetype-src-psaux/psaux.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-psaux/psaux.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-psaux/psauxmod.c.yml b/tests/cluecode/data/ics/freetype-src-psaux/psauxmod.c.yml
index 3a63f58668..cda58e547f 100644
--- a/tests/cluecode/data/ics/freetype-src-psaux/psauxmod.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-psaux/psauxmod.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2000-2001, 2002, 2003, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-psaux/psauxmod.h.yml b/tests/cluecode/data/ics/freetype-src-psaux/psauxmod.h.yml
index 2f26407729..1f210facec 100644
--- a/tests/cluecode/data/ics/freetype-src-psaux/psauxmod.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-psaux/psauxmod.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2000-2001 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-psaux/psconv.c.yml b/tests/cluecode/data/ics/freetype-src-psaux/psconv.c.yml
index 05a4e49841..0a07c686aa 100644
--- a/tests/cluecode/data/ics/freetype-src-psaux/psconv.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-psaux/psconv.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2006, 2008, 2009 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-psaux/t1cmap.c.yml b/tests/cluecode/data/ics/freetype-src-psaux/t1cmap.c.yml
index 9611ca2348..533fac277d 100644
--- a/tests/cluecode/data/ics/freetype-src-psaux/t1cmap.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-psaux/t1cmap.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2002, 2003, 2006, 2007 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-psaux/t1decode.c.yml b/tests/cluecode/data/ics/freetype-src-psaux/t1decode.c.yml
index 6ebd534226..2d8d15a497 100644
--- a/tests/cluecode/data/ics/freetype-src-psaux/t1decode.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-psaux/t1decode.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2000-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-psaux/t1decode.h.yml b/tests/cluecode/data/ics/freetype-src-psaux/t1decode.h.yml
index a528fc8883..b02341e8d0 100644
--- a/tests/cluecode/data/ics/freetype-src-psaux/t1decode.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-psaux/t1decode.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2000-2001, 2002, 2003 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-pshinter/pshalgo.c.yml b/tests/cluecode/data/ics/freetype-src-pshinter/pshalgo.c.yml
index 965b176b46..9829c452df 100644
--- a/tests/cluecode/data/ics/freetype-src-pshinter/pshalgo.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-pshinter/pshalgo.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-pshinter/pshalgo.h.yml b/tests/cluecode/data/ics/freetype-src-pshinter/pshalgo.h.yml
index 4aae7a8764..b58b0d68d0 100644
--- a/tests/cluecode/data/ics/freetype-src-pshinter/pshalgo.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-pshinter/pshalgo.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2001, 2002, 2003, 2008 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-pshinter/pshglob.c.yml b/tests/cluecode/data/ics/freetype-src-pshinter/pshglob.c.yml
index f20825dc27..676754ed3d 100644
--- a/tests/cluecode/data/ics/freetype-src-pshinter/pshglob.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-pshinter/pshglob.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2001, 2002, 2003, 2004, 2006, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-pshinter/pshglob.h.yml b/tests/cluecode/data/ics/freetype-src-pshinter/pshglob.h.yml
index 9eceecc432..52abf126a6 100644
--- a/tests/cluecode/data/ics/freetype-src-pshinter/pshglob.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-pshinter/pshglob.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2001, 2002, 2003 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-pshinter/pshinter.c.yml b/tests/cluecode/data/ics/freetype-src-pshinter/pshinter.c.yml
index 0e38e66f26..e5e5440b6e 100644
--- a/tests/cluecode/data/ics/freetype-src-pshinter/pshinter.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-pshinter/pshinter.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2001, 2003 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-pshinter/pshmod.c.yml b/tests/cluecode/data/ics/freetype-src-pshinter/pshmod.c.yml
index 7c5e07845d..3d1ab0dd17 100644
--- a/tests/cluecode/data/ics/freetype-src-pshinter/pshmod.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-pshinter/pshmod.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2001, 2002, 2007 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-pshinter/pshrec.c.yml b/tests/cluecode/data/ics/freetype-src-pshinter/pshrec.c.yml
index c98d34b9bb..11f1514c9a 100644
--- a/tests/cluecode/data/ics/freetype-src-pshinter/pshrec.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-pshinter/pshrec.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2001, 2002, 2003, 2004, 2007, 2009 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-pshinter/pshrec.h.yml b/tests/cluecode/data/ics/freetype-src-pshinter/pshrec.h.yml
index bb61b12cc8..29d6ddb15e 100644
--- a/tests/cluecode/data/ics/freetype-src-pshinter/pshrec.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-pshinter/pshrec.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2001, 2002, 2003, 2006, 2008 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-psnames/psmodule.c.yml b/tests/cluecode/data/ics/freetype-src-psnames/psmodule.c.yml
index 6cb25b4aa1..fe1a7265ff 100644
--- a/tests/cluecode/data/ics/freetype-src-psnames/psmodule.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-psnames/psmodule.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2005, 2006, 2007, 2008 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-psnames/psmodule.h.yml b/tests/cluecode/data/ics/freetype-src-psnames/psmodule.h.yml
index 948231570a..2c140cbc54 100644
--- a/tests/cluecode/data/ics/freetype-src-psnames/psmodule.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-psnames/psmodule.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-psnames/pstables.h.yml b/tests/cluecode/data/ics/freetype-src-psnames/pstables.h.yml
index e5adcb670e..e027fe4309 100644
--- a/tests/cluecode/data/ics/freetype-src-psnames/pstables.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-psnames/pstables.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2005, 2008 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-raster/ftmisc.h.yml b/tests/cluecode/data/ics/freetype-src-raster/ftmisc.h.yml
index 19ec92ffc3..e437ee3c8a 100644
--- a/tests/cluecode/data/ics/freetype-src-raster/ftmisc.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-raster/ftmisc.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2005, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-raster/ftraster.c.yml b/tests/cluecode/data/ics/freetype-src-raster/ftraster.c.yml
index 0468df8040..d74f7e3f55 100644
--- a/tests/cluecode/data/ics/freetype-src-raster/ftraster.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-raster/ftraster.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2005, 2007, 2008, 2009, 2010, 2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-raster/ftrend1.c.yml b/tests/cluecode/data/ics/freetype-src-raster/ftrend1.c.yml
index ccbc5a9725..1fb73c2923 100644
--- a/tests/cluecode/data/ics/freetype-src-raster/ftrend1.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-raster/ftrend1.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2005, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-sfnt/sfdriver.c.yml b/tests/cluecode/data/ics/freetype-src-sfnt/sfdriver.c.yml
index 6f84e4e529..9ebc089c53 100644
--- a/tests/cluecode/data/ics/freetype-src-sfnt/sfdriver.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-sfnt/sfdriver.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2007, 2009-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-sfnt/sferrors.h.yml b/tests/cluecode/data/ics/freetype-src-sfnt/sferrors.h.yml
index 1558a59a29..ea2aa00210 100644
--- a/tests/cluecode/data/ics/freetype-src-sfnt/sferrors.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-sfnt/sferrors.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2001, 2004 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-sfnt/sfobjs.c.yml b/tests/cluecode/data/ics/freetype-src-sfnt/sfobjs.c.yml
index 8d2841946e..b82a2e29b1 100644
--- a/tests/cluecode/data/ics/freetype-src-sfnt/sfobjs.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-sfnt/sfobjs.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2008, 2010-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-sfnt/ttbdf.c.yml b/tests/cluecode/data/ics/freetype-src-sfnt/ttbdf.c.yml
index 1fc415ddce..5de5a406ce 100644
--- a/tests/cluecode/data/ics/freetype-src-sfnt/ttbdf.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-sfnt/ttbdf.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2005, 2006, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-sfnt/ttcmap.c.yml b/tests/cluecode/data/ics/freetype-src-sfnt/ttcmap.c.yml
index 78f1c91818..647e30a1e0 100644
--- a/tests/cluecode/data/ics/freetype-src-sfnt/ttcmap.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-sfnt/ttcmap.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-sfnt/ttcmap.h.yml b/tests/cluecode/data/ics/freetype-src-sfnt/ttcmap.h.yml
index bcb4a284d3..bdd494e4af 100644
--- a/tests/cluecode/data/ics/freetype-src-sfnt/ttcmap.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-sfnt/ttcmap.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2002, 2003, 2004, 2005 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-sfnt/ttkern.c.yml b/tests/cluecode/data/ics/freetype-src-sfnt/ttkern.c.yml
index c0be4ab8db..81e7988f27 100644
--- a/tests/cluecode/data/ics/freetype-src-sfnt/ttkern.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-sfnt/ttkern.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-sfnt/ttkern.h.yml b/tests/cluecode/data/ics/freetype-src-sfnt/ttkern.h.yml
index 687f43fa06..d1179f4374 100644
--- a/tests/cluecode/data/ics/freetype-src-sfnt/ttkern.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-sfnt/ttkern.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2005, 2007 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-sfnt/ttload.h.yml b/tests/cluecode/data/ics/freetype-src-sfnt/ttload.h.yml
index 957ae8e491..0e05b0d149 100644
--- a/tests/cluecode/data/ics/freetype-src-sfnt/ttload.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-sfnt/ttload.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2005, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-sfnt/ttmtx.c.yml b/tests/cluecode/data/ics/freetype-src-sfnt/ttmtx.c.yml
index d98c4b073f..f45abaf290 100644
--- a/tests/cluecode/data/ics/freetype-src-sfnt/ttmtx.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-sfnt/ttmtx.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2006-2009, 2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-sfnt/ttpost.c.yml b/tests/cluecode/data/ics/freetype-src-sfnt/ttpost.c.yml
index a17c3e74f9..25cdedd6bb 100644
--- a/tests/cluecode/data/ics/freetype-src-sfnt/ttpost.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-sfnt/ttpost.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-sfnt/ttsbit.h.yml b/tests/cluecode/data/ics/freetype-src-sfnt/ttsbit.h.yml
index b1683f13da..335ae026af 100644
--- a/tests/cluecode/data/ics/freetype-src-sfnt/ttsbit.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-sfnt/ttsbit.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-sfnt/ttsbit0.c.yml b/tests/cluecode/data/ics/freetype-src-sfnt/ttsbit0.c.yml
index 79d9ab6d7e..8a6cd0e205 100644
--- a/tests/cluecode/data/ics/freetype-src-sfnt/ttsbit0.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-sfnt/ttsbit0.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2005, 2006, 2007, 2008, 2009 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-smooth/ftgrays.c.yml b/tests/cluecode/data/ics/freetype-src-smooth/ftgrays.c.yml
index de132cb213..79429f3556 100644
--- a/tests/cluecode/data/ics/freetype-src-smooth/ftgrays.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-smooth/ftgrays.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2000-2003, 2005-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-smooth/ftsmooth.c.yml b/tests/cluecode/data/ics/freetype-src-smooth/ftsmooth.c.yml
index 2fee39bb16..4e6b5c8330 100644
--- a/tests/cluecode/data/ics/freetype-src-smooth/ftsmooth.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-smooth/ftsmooth.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 2000-2006, 2009-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-truetype/truetype.c.yml b/tests/cluecode/data/ics/freetype-src-truetype/truetype.c.yml
index b41505578f..dd77df6642 100644
--- a/tests/cluecode/data/ics/freetype-src-truetype/truetype.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-truetype/truetype.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2004, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-truetype/ttgload.c.yml b/tests/cluecode/data/ics/freetype-src-truetype/ttgload.c.yml
index 995b0e06ba..1e6d9f5531 100644
--- a/tests/cluecode/data/ics/freetype-src-truetype/ttgload.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-truetype/ttgload.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2011 David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-truetype/ttgload.h.yml b/tests/cluecode/data/ics/freetype-src-truetype/ttgload.h.yml
index bb9a550892..66f50a385a 100644
--- a/tests/cluecode/data/ics/freetype-src-truetype/ttgload.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-truetype/ttgload.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2006, 2008, 2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-truetype/ttinterp.h.yml b/tests/cluecode/data/ics/freetype-src-truetype/ttinterp.h.yml
index 45ed9de1a0..48ccec3717 100644
--- a/tests/cluecode/data/ics/freetype-src-truetype/ttinterp.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-truetype/ttinterp.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-truetype/ttobjs.h.yml b/tests/cluecode/data/ics/freetype-src-truetype/ttobjs.h.yml
index ea981a1317..d836330378 100644
--- a/tests/cluecode/data/ics/freetype-src-truetype/ttobjs.h.yml
+++ b/tests/cluecode/data/ics/freetype-src-truetype/ttobjs.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2009, 2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype-src-truetype/ttpload.c.yml b/tests/cluecode/data/ics/freetype-src-truetype/ttpload.c.yml
index d9305f96ff..443fc6ccb9 100644
--- a/tests/cluecode/data/ics/freetype-src-truetype/ttpload.c.yml
+++ b/tests/cluecode/data/ics/freetype-src-truetype/ttpload.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Turner, Robert Wilhelm, and Werner Lemberg
     count: 1
+allrights:
+  - Copyright 1996-2002, 2004-2011 by David Turner, Robert Wilhelm, and Werner Lemberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/freetype/NOTICE.yml b/tests/cluecode/data/ics/freetype/NOTICE.yml
index 44b836e35d..45f382aee8 100644
--- a/tests/cluecode/data/ics/freetype/NOTICE.yml
+++ b/tests/cluecode/data/ics/freetype/NOTICE.yml
@@ -15,3 +15,7 @@ holders_summary:
     count: 2
   - value: The FreeType Project
     count: 1
+allrights:
+  - Copyright 1996-2002, 2006 by David Turner, Robert Wilhelm, and Werner Lemberg
+  - copyright (c) The FreeType Project (www.freetype.org). All rights reserved.
+  - copyright (c) 1996-2000 by David Turner, Robert Wilhelm, and Werner Lemberg. All rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/gtest-test/gtest_filter_unittest.py.yml b/tests/cluecode/data/ics/gtest-test/gtest_filter_unittest.py.yml
index 942b76e270..6069b5e76b 100644
--- a/tests/cluecode/data/ics/gtest-test/gtest_filter_unittest.py.yml
+++ b/tests/cluecode/data/ics/gtest-test/gtest_filter_unittest.py.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2005, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/gtest-test/gtest_nc_test.py.yml b/tests/cluecode/data/ics/gtest-test/gtest_nc_test.py.yml
index 787d756a0d..73ae41aa09 100644
--- a/tests/cluecode/data/ics/gtest-test/gtest_nc_test.py.yml
+++ b/tests/cluecode/data/ics/gtest-test/gtest_nc_test.py.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2007, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/harfbuzz-contrib/harfbuzz-unicode-icu.c.yml b/tests/cluecode/data/ics/harfbuzz-contrib/harfbuzz-unicode-icu.c.yml
index 68f0c90ee4..5167352989 100644
--- a/tests/cluecode/data/ics/harfbuzz-contrib/harfbuzz-unicode-icu.c.yml
+++ b/tests/cluecode/data/ics/harfbuzz-contrib/harfbuzz-unicode-icu.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Google
     count: 1
+allrights:
+  - Copyright 2010, The Android Open Source Project
+  - Copyright 2010, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/iproute2-include-linux-tc_act/tc_skbedit.h.yml b/tests/cluecode/data/ics/iproute2-include-linux-tc_act/tc_skbedit.h.yml
index b9fc238023..78a02f192f 100644
--- a/tests/cluecode/data/ics/iproute2-include-linux-tc_act/tc_skbedit.h.yml
+++ b/tests/cluecode/data/ics/iproute2-include-linux-tc_act/tc_skbedit.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Intel Corporation
     count: 1
+allrights:
+  - Copyright (c) 2008, Intel Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/iproute2-include-linux/if_addrlabel.h.yml b/tests/cluecode/data/ics/iproute2-include-linux/if_addrlabel.h.yml
index e7e7bb1648..76553fc4bd 100644
--- a/tests/cluecode/data/ics/iproute2-include-linux/if_addrlabel.h.yml
+++ b/tests/cluecode/data/ics/iproute2-include-linux/if_addrlabel.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: USAGI/WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 2007 USAGI/WIDE Project, All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-include-glibc/NOTICE.yml b/tests/cluecode/data/ics/ipsec-tools-src-include-glibc/NOTICE.yml
index 32136a19f8..c82699a9a6 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-include-glibc/NOTICE.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-include-glibc/NOTICE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1991, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-libipsec/NOTICE.yml b/tests/cluecode/data/ics/ipsec-tools-src-libipsec/NOTICE.yml
index f41312ceaf..b2ad99f5cf 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-libipsec/NOTICE.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-libipsec/NOTICE.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: WIDE Project
     count: 2
+allrights:
+  - Copyright (c) 1995, 1996, 1997, 1998, and 1999 WIDE Project. All rights reserved.
+  - Copyright (c) 1995, 1996, 1997, and 1998 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-libipsec/ipsec_dump_policy.c.yml b/tests/cluecode/data/ics/ipsec-tools-src-libipsec/ipsec_dump_policy.c.yml
index db71a49fb7..336a00208c 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-libipsec/ipsec_dump_policy.c.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-libipsec/ipsec_dump_policy.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997, 1998, and 1999 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-libipsec/ipsec_set_policy.3.yml b/tests/cluecode/data/ics/ipsec-tools-src-libipsec/ipsec_set_policy.3.yml
index db71a49fb7..336a00208c 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-libipsec/ipsec_set_policy.3.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-libipsec/ipsec_set_policy.3.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997, 1998, and 1999 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-libipsec/key_debug.c.yml b/tests/cluecode/data/ics/ipsec-tools-src-libipsec/key_debug.c.yml
index 1496c41958..dec39c12bf 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-libipsec/key_debug.c.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-libipsec/key_debug.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997, and 1998 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-libipsec/policy_parse.y.yml b/tests/cluecode/data/ics/ipsec-tools-src-libipsec/policy_parse.y.yml
index db71a49fb7..336a00208c 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-libipsec/policy_parse.y.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-libipsec/policy_parse.y.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997, 1998, and 1999 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-racoon-missing-crypto-sha2/sha2.c.yml b/tests/cluecode/data/ics/ipsec-tools-src-racoon-missing-crypto-sha2/sha2.c.yml
index c8eb9963aa..61c89ff107 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-racoon-missing-crypto-sha2/sha2.c.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-racoon-missing-crypto-sha2/sha2.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Aaron D. Gifford
     count: 1
+allrights:
+  - Copyright 2000 Aaron D. Gifford. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-racoon-missing-crypto-sha2/sha2.h.yml b/tests/cluecode/data/ics/ipsec-tools-src-racoon-missing-crypto-sha2/sha2.h.yml
index c8eb9963aa..61c89ff107 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-racoon-missing-crypto-sha2/sha2.h.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-racoon-missing-crypto-sha2/sha2.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Aaron D. Gifford
     count: 1
+allrights:
+  - Copyright 2000 Aaron D. Gifford. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-racoon/NOTICE.yml b/tests/cluecode/data/ics/ipsec-tools-src-racoon/NOTICE.yml
index 6d5cbf4257..905e61c950 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-racoon/NOTICE.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-racoon/NOTICE.yml
@@ -43,3 +43,16 @@ holders_summary:
     count: 1
   - value: Wasabi Systems, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997, and 1998 WIDE Project. All rights reserved.
+  - Copyright (c) 2004 Emmanuel Dreyfus All rights reserved.
+  - Copyright (c) 2004-2006 Emmanuel Dreyfus All rights reserved.
+  - Copyright (c) 2000 WIDE Project. All rights reserved.
+  - Copyright (c) 2004-2005 Emmanuel Dreyfus All rights reserved.
+  - Copyright (c) 2000, 2001 WIDE Project. All rights reserved.
+  - Copyright (c) 2004 SuSE Linux AG, Nuernberg, Germany.
+  - Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 and 2003 WIDE Project. All rights reserved.
+  - Copyright 2000 Wasabi Systems, Inc. All rights reserved.
+  - Copyright (c) 2005 International Business Machines Corporation
+  - Copyright (c) 2005 by Trusted Computer Solutions, Inc. All rights reserved.
+  - Copyright 2000 Aaron D. Gifford. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-racoon/cfparse.y.yml b/tests/cluecode/data/ics/ipsec-tools-src-racoon/cfparse.y.yml
index 8eb65b35d6..5681a0575b 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-racoon/cfparse.y.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-racoon/cfparse.y.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 and 2003 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-racoon/dump.h.yml b/tests/cluecode/data/ics/ipsec-tools-src-racoon/dump.h.yml
index 739ff18d98..6c99a4c716 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-racoon/dump.h.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-racoon/dump.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 2000 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-racoon/evt.c.yml b/tests/cluecode/data/ics/ipsec-tools-src-racoon/evt.c.yml
index e2d9d49009..34e8c1700e 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-racoon/evt.c.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-racoon/evt.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Timo Teras
     count: 1
+allrights:
+  - Copyright (c) 2004 Emmanuel Dreyfus
+  - Copyright (c) 2008 Timo Teras All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-racoon/gcmalloc.h.yml b/tests/cluecode/data/ics/ipsec-tools-src-racoon/gcmalloc.h.yml
index 400e413ce0..791c61c370 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-racoon/gcmalloc.h.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-racoon/gcmalloc.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 2000, 2001 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-racoon/genlist.c.yml b/tests/cluecode/data/ics/ipsec-tools-src-racoon/genlist.c.yml
index eee1f4f06d..9a9d819eab 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-racoon/genlist.c.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-racoon/genlist.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: SuSE Linux AG, Nuernberg, Germany
     count: 1
+allrights:
+  - Copyright (c) 2004 SuSE Linux AG, Nuernberg, Germany.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-racoon/grabmyaddr.c.yml b/tests/cluecode/data/ics/ipsec-tools-src-racoon/grabmyaddr.c.yml
index 5edfcc73cc..631219c2e4 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-racoon/grabmyaddr.c.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-racoon/grabmyaddr.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997, and 1998 WIDE Project.
+  - Copyright (c) 2008 Timo Teras <timo.teras@iki.fi> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-racoon/gssapi.c.yml b/tests/cluecode/data/ics/ipsec-tools-src-racoon/gssapi.c.yml
index 43e73eacbb..d95ec96906 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-racoon/gssapi.c.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-racoon/gssapi.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Wasabi Systems, Inc.
     count: 1
+allrights:
+  - Copyright 2000 Wasabi Systems, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-racoon/handler.h.yml b/tests/cluecode/data/ics/ipsec-tools-src-racoon/handler.h.yml
index 1496c41958..dec39c12bf 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-racoon/handler.h.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-racoon/handler.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997, and 1998 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-racoon/isakmp_cfg.c.yml b/tests/cluecode/data/ics/ipsec-tools-src-racoon/isakmp_cfg.c.yml
index 86cc2eae9d..b83e7dd6f4 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-racoon/isakmp_cfg.c.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-racoon/isakmp_cfg.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Emmanuel Dreyfus
     count: 1
+allrights:
+  - Copyright (c) 2004-2006 Emmanuel Dreyfus All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-racoon/isakmp_cfg.h.yml b/tests/cluecode/data/ics/ipsec-tools-src-racoon/isakmp_cfg.h.yml
index f4274c841c..70307490b5 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-racoon/isakmp_cfg.h.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-racoon/isakmp_cfg.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Emmanuel Dreyfus
     count: 1
+allrights:
+  - Copyright (c) 2004 Emmanuel Dreyfus All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-racoon/isakmp_xauth.c.yml b/tests/cluecode/data/ics/ipsec-tools-src-racoon/isakmp_xauth.c.yml
index 872149b517..79cd28f101 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-racoon/isakmp_xauth.c.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-racoon/isakmp_xauth.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Emmanuel Dreyfus
     count: 1
+allrights:
+  - Copyright (c) 2004-2005 Emmanuel Dreyfus All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-racoon/plainrsa-gen.8.yml b/tests/cluecode/data/ics/ipsec-tools-src-racoon/plainrsa-gen.8.yml
index eee1f4f06d..9a9d819eab 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-racoon/plainrsa-gen.8.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-racoon/plainrsa-gen.8.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: SuSE Linux AG, Nuernberg, Germany
     count: 1
+allrights:
+  - Copyright (c) 2004 SuSE Linux AG, Nuernberg, Germany.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-racoon/racoon.8.yml b/tests/cluecode/data/ics/ipsec-tools-src-racoon/racoon.8.yml
index 1496c41958..dec39c12bf 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-racoon/racoon.8.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-racoon/racoon.8.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997, and 1998 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-racoon/racoonctl.8.yml b/tests/cluecode/data/ics/ipsec-tools-src-racoon/racoonctl.8.yml
index f4274c841c..70307490b5 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-racoon/racoonctl.8.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-racoon/racoonctl.8.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Emmanuel Dreyfus
     count: 1
+allrights:
+  - Copyright (c) 2004 Emmanuel Dreyfus All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-racoon/racoonctl.c.yml b/tests/cluecode/data/ics/ipsec-tools-src-racoon/racoonctl.c.yml
index 3a9cf4aa54..1ebc9c2264 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-racoon/racoonctl.c.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-racoon/racoonctl.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997, and 1998 WIDE Project.
+  - Copyright (c) 2008 Timo Teras. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools-src-racoon/security.c.yml b/tests/cluecode/data/ics/ipsec-tools-src-racoon/security.c.yml
index e23184d80c..9d6b26bb93 100644
--- a/tests/cluecode/data/ics/ipsec-tools-src-racoon/security.c.yml
+++ b/tests/cluecode/data/ics/ipsec-tools-src-racoon/security.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Trusted Computer Solutions, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2005 International Business Machines Corporation
+  - Copyright (c) 2005 by Trusted Computer Solutions, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ipsec-tools/NOTICE.yml b/tests/cluecode/data/ics/ipsec-tools/NOTICE.yml
index b81368e882..3e17e5eea9 100644
--- a/tests/cluecode/data/ics/ipsec-tools/NOTICE.yml
+++ b/tests/cluecode/data/ics/ipsec-tools/NOTICE.yml
@@ -51,3 +51,19 @@ holders_summary:
     count: 1
   - value: Wasabi Systems, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997, and 1998 WIDE Project. All rights reserved.
+  - Copyright (c) 2004 Emmanuel Dreyfus All rights reserved.
+  - Copyright (c) 2004-2006 Emmanuel Dreyfus All rights reserved.
+  - Copyright (c) 2000 WIDE Project. All rights reserved.
+  - Copyright (c) 2004-2005 Emmanuel Dreyfus All rights reserved.
+  - Copyright (c) 2000, 2001 WIDE Project. All rights reserved.
+  - Copyright (c) 2004 SuSE Linux AG, Nuernberg, Germany.
+  - Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 and 2003 WIDE Project. All rights reserved.
+  - Copyright 2000 Wasabi Systems, Inc. All rights reserved.
+  - Copyright (c) 2005 International Business Machines Corporation
+  - Copyright (c) 2005 by Trusted Computer Solutions, Inc. All rights reserved.
+  - Copyright 2000 Aaron D. Gifford. All rights reserved.
+  - Copyright (c) 1995, 1996, 1997, 1998, and 1999 WIDE Project. All rights reserved.
+  - Copyright (c) 1995, 1996, 1997, and 1998 WIDE Project. All rights reserved.
+  - Copyright (c) 1991, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/iptables-extensions/libxt_IDLETIMER.c.yml b/tests/cluecode/data/ics/iptables-extensions/libxt_IDLETIMER.c.yml
index 330cd9e953..e8f091e1d6 100644
--- a/tests/cluecode/data/ics/iptables-extensions/libxt_IDLETIMER.c.yml
+++ b/tests/cluecode/data/ics/iptables-extensions/libxt_IDLETIMER.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Nokia Corporation
     count: 1
+allrights:
+  - Copyright (c) 2010 Nokia Corporation. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/iptables-extensions/libxt_TEE.c.yml b/tests/cluecode/data/ics/iptables-extensions/libxt_TEE.c.yml
index bda0580574..d069742f3f 100644
--- a/tests/cluecode/data/ics/iptables-extensions/libxt_TEE.c.yml
+++ b/tests/cluecode/data/ics/iptables-extensions/libxt_TEE.c.yml
@@ -16,3 +16,5 @@ expected_failures:
   - copyrights
   - holders
   - holders_summary
+allrights:
+  - Copyright (c) Sebastian Classen
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/iptables-extensions/libxt_conntrack.c.yml b/tests/cluecode/data/ics/iptables-extensions/libxt_conntrack.c.yml
index cd3833fb2e..93284ed520 100644
--- a/tests/cluecode/data/ics/iptables-extensions/libxt_conntrack.c.yml
+++ b/tests/cluecode/data/ics/iptables-extensions/libxt_conntrack.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Marc Boucher
     count: 1
+allrights:
+  - (c) 2001 Marc Boucher (marc@mbsi.ca).
+  - Copyright (c) CC Computer Consultants GmbH, 2007 - 2008 Jan Engelhardt <jengelh@computergmbh.de>
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/iptables-include-linux-netfilter/xt_conntrack.h.yml b/tests/cluecode/data/ics/iptables-include-linux-netfilter/xt_conntrack.h.yml
index 780972a24b..c3edca9d4a 100644
--- a/tests/cluecode/data/ics/iptables-include-linux-netfilter/xt_conntrack.h.yml
+++ b/tests/cluecode/data/ics/iptables-include-linux-netfilter/xt_conntrack.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Marc Boucher
     count: 1
+allrights:
+  - (c) 2001 Marc Boucher (marc@mbsi.ca).
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/iptables-iptables/iptables-apply.8.yml b/tests/cluecode/data/ics/iptables-iptables/iptables-apply.8.yml
index c04b01c7fa..7c446a63ed 100644
--- a/tests/cluecode/data/ics/iptables-iptables/iptables-apply.8.yml
+++ b/tests/cluecode/data/ics/iptables-iptables/iptables-apply.8.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Martin F. Krafft
     count: 1
+allrights:
+  - copyright by Martin F. Krafft.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/iptables-libipq/ipq_create_handle.3.yml b/tests/cluecode/data/ics/iptables-libipq/ipq_create_handle.3.yml
index 21df2a8253..e793cb911b 100644
--- a/tests/cluecode/data/ics/iptables-libipq/ipq_create_handle.3.yml
+++ b/tests/cluecode/data/ics/iptables-libipq/ipq_create_handle.3.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Netfilter Core Team
     count: 2
+allrights:
+  - Copyright (c) 2000-2001 Netfilter Core Team
+  - Copyright (c) 2000-2001 Netfilter Core Team.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/iptables-libipq/ipq_errstr.3.yml b/tests/cluecode/data/ics/iptables-libipq/ipq_errstr.3.yml
index 833957b136..cccea6e557 100644
--- a/tests/cluecode/data/ics/iptables-libipq/ipq_errstr.3.yml
+++ b/tests/cluecode/data/ics/iptables-libipq/ipq_errstr.3.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Netfilter Core Team
     count: 2
+allrights:
+  - Copyright (c) 2000 Netfilter Core Team
+  - Copyright (c) 2000-2001 Netfilter Core Team.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/javassist-sample-preproc/Assistant.java.yml b/tests/cluecode/data/ics/javassist-sample-preproc/Assistant.java.yml
index 6abc7e6b12..c6785c824e 100644
--- a/tests/cluecode/data/ics/javassist-sample-preproc/Assistant.java.yml
+++ b/tests/cluecode/data/ics/javassist-sample-preproc/Assistant.java.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Shigeru Chiba
     count: 1
+allrights:
+  - Copyright (c) 1999-2005 Shigeru Chiba. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/javassist-src-main-javassist-bytecode-annotation/Annotation.java.yml b/tests/cluecode/data/ics/javassist-src-main-javassist-bytecode-annotation/Annotation.java.yml
index ea59d7eba6..3c1000fe9a 100644
--- a/tests/cluecode/data/ics/javassist-src-main-javassist-bytecode-annotation/Annotation.java.yml
+++ b/tests/cluecode/data/ics/javassist-src-main-javassist-bytecode-annotation/Annotation.java.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Bill Burke
     count: 1
+allrights:
+  - Copyright (c) 2004 Bill Burke. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/javassist-src-main-javassist-bytecode-annotation/NoSuchClassError.java.yml b/tests/cluecode/data/ics/javassist-src-main-javassist-bytecode-annotation/NoSuchClassError.java.yml
index 3df8073aa9..f7f139779d 100644
--- a/tests/cluecode/data/ics/javassist-src-main-javassist-bytecode-annotation/NoSuchClassError.java.yml
+++ b/tests/cluecode/data/ics/javassist-src-main-javassist-bytecode-annotation/NoSuchClassError.java.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Shigeru Chiba
     count: 1
+allrights:
+  - Copyright (c) 1999-2009 Shigeru Chiba. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/javassist-src-main-javassist-bytecode/ByteStream.java.yml b/tests/cluecode/data/ics/javassist-src-main-javassist-bytecode/ByteStream.java.yml
index 506e5a6d0a..71d6e7521b 100644
--- a/tests/cluecode/data/ics/javassist-src-main-javassist-bytecode/ByteStream.java.yml
+++ b/tests/cluecode/data/ics/javassist-src-main-javassist-bytecode/ByteStream.java.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Shigeru Chiba
     count: 1
+allrights:
+  - Copyright (c) 1999-2010 Shigeru Chiba. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/javassist-src-main-javassist-bytecode/InstructionPrinter.java.yml b/tests/cluecode/data/ics/javassist-src-main-javassist-bytecode/InstructionPrinter.java.yml
index 0fe13ba01e..23dd7500cc 100644
--- a/tests/cluecode/data/ics/javassist-src-main-javassist-bytecode/InstructionPrinter.java.yml
+++ b/tests/cluecode/data/ics/javassist-src-main-javassist-bytecode/InstructionPrinter.java.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Shigeru Chiba, and others
     count: 1
+allrights:
+  - Copyright (c) 1999-2007 Shigeru Chiba, and others. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/javassist-src-main-javassist/ByteArrayClassPath.java.yml b/tests/cluecode/data/ics/javassist-src-main-javassist/ByteArrayClassPath.java.yml
index 63671e1778..9c9618f808 100644
--- a/tests/cluecode/data/ics/javassist-src-main-javassist/ByteArrayClassPath.java.yml
+++ b/tests/cluecode/data/ics/javassist-src-main-javassist/ByteArrayClassPath.java.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Shigeru Chiba
     count: 1
+allrights:
+  - Copyright (c) 1999-2007 Shigeru Chiba. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/javassist-src-main-javassist/CtClass.java.yml b/tests/cluecode/data/ics/javassist-src-main-javassist/CtClass.java.yml
index 9329898a79..008fea1d7f 100644
--- a/tests/cluecode/data/ics/javassist-src-main-javassist/CtClass.java.yml
+++ b/tests/cluecode/data/ics/javassist-src-main-javassist/CtClass.java.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Shigeru Chiba
     count: 2
+allrights:
+  - Copyright (c) 1999-2007 Shigeru Chiba. All Rights Reserved.
+  - Copyright (c) 1999-2010 Shigeru Chiba.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/javassist-tutorial/tutorial.html.yml b/tests/cluecode/data/ics/javassist-tutorial/tutorial.html.yml
index 3694bbf126..e7bd0597f5 100644
--- a/tests/cluecode/data/ics/javassist-tutorial/tutorial.html.yml
+++ b/tests/cluecode/data/ics/javassist-tutorial/tutorial.html.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Shigeru Chiba
     count: 1
+allrights:
+  - Copyright (c) 2000-2010 by Shigeru Chiba, All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/javassist/License.html.yml b/tests/cluecode/data/ics/javassist/License.html.yml
index 506e5a6d0a..71d6e7521b 100644
--- a/tests/cluecode/data/ics/javassist/License.html.yml
+++ b/tests/cluecode/data/ics/javassist/License.html.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Shigeru Chiba
     count: 1
+allrights:
+  - Copyright (c) 1999-2010 Shigeru Chiba. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/javassist/NOTICE.yml b/tests/cluecode/data/ics/javassist/NOTICE.yml
index 506e5a6d0a..71d6e7521b 100644
--- a/tests/cluecode/data/ics/javassist/NOTICE.yml
+++ b/tests/cluecode/data/ics/javassist/NOTICE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Shigeru Chiba
     count: 1
+allrights:
+  - Copyright (c) 1999-2010 Shigeru Chiba. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/javassist/Readme.html.yml b/tests/cluecode/data/ics/javassist/Readme.html.yml
index 70b49fba65..8a0051a432 100644
--- a/tests/cluecode/data/ics/javassist/Readme.html.yml
+++ b/tests/cluecode/data/ics/javassist/Readme.html.yml
@@ -13,3 +13,7 @@ holders:
 holders_summary:
   - value: Shigeru Chiba
     count: 3
+allrights:
+  - Copyright (c) 1999-2010 by Shigeru Chiba, All rights reserved.
+  - Copyright (c) 1999-2010 Shigeru Chiba. All Rights Reserved.
+  - Copyright (c) 1999-2010 Shigeru Chiba. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jhead/main.c.yml b/tests/cluecode/data/ics/jhead/main.c.yml
index 7bd76166a5..76a76c3538 100644
--- a/tests/cluecode/data/ics/jhead/main.c.yml
+++ b/tests/cluecode/data/ics/jhead/main.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Android Open Source Project
     count: 1
+allrights:
+  - Copyright (c) 2008, The Android Open Source Project All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/NOTICE.yml b/tests/cluecode/data/ics/jpeg/NOTICE.yml
index 299bf4cd8e..a1d2a6511f 100644
--- a/tests/cluecode/data/ics/jpeg/NOTICE.yml
+++ b/tests/cluecode/data/ics/jpeg/NOTICE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - copyright (c) 1991-1998, Thomas G. Lane. All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/README.yml b/tests/cluecode/data/ics/jpeg/README.yml
index d2d234661a..32885858d8 100644
--- a/tests/cluecode/data/ics/jpeg/README.yml
+++ b/tests/cluecode/data/ics/jpeg/README.yml
@@ -25,3 +25,9 @@ holders_summary:
     count: 1
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - copyright (c) 1991-1998, Thomas G. Lane. All Rights Reserved
+  - copyright holder, Aladdin Enterprises of Menlo Park
+  - copyright by the Free Software Foundation
+  - copyright by M.I.T.
+  - Copyright property of CompuServe Incorporated.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/ansi2knr.c.yml b/tests/cluecode/data/ics/jpeg/ansi2knr.c.yml
index c1f5081975..49d797be71 100644
--- a/tests/cluecode/data/ics/jpeg/ansi2knr.c.yml
+++ b/tests/cluecode/data/ics/jpeg/ansi2knr.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Richard M. Stallman
     count: 1
+allrights:
+  - Copyright (c) 1988 Richard M. Stallman
+  - Copyright (c) 1989 Aladdin Enterprises. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/cderror.h.yml b/tests/cluecode/data/ics/jpeg/cderror.h.yml
index 42d963ee87..538e3dfc12 100644
--- a/tests/cluecode/data/ics/jpeg/cderror.h.yml
+++ b/tests/cluecode/data/ics/jpeg/cderror.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - Copyright (c) 1994-1997, Thomas G. Lane.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/cdjpeg.c.yml b/tests/cluecode/data/ics/jpeg/cdjpeg.c.yml
index 8acba5855b..e3c6bbdf8a 100644
--- a/tests/cluecode/data/ics/jpeg/cdjpeg.c.yml
+++ b/tests/cluecode/data/ics/jpeg/cdjpeg.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - Copyright (c) 1991-1997, Thomas G. Lane.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/cjpeg.c.yml b/tests/cluecode/data/ics/jpeg/cjpeg.c.yml
index 8363ba6437..2d167409bb 100644
--- a/tests/cluecode/data/ics/jpeg/cjpeg.c.yml
+++ b/tests/cluecode/data/ics/jpeg/cjpeg.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - Copyright (c) 1991-1998, Thomas G. Lane.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/ckconfig.c.yml b/tests/cluecode/data/ics/jpeg/ckconfig.c.yml
index 7133349f02..bb92638579 100644
--- a/tests/cluecode/data/ics/jpeg/ckconfig.c.yml
+++ b/tests/cluecode/data/ics/jpeg/ckconfig.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - Copyright (c) 1991-1994, Thomas G. Lane.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/coderules.doc.yml b/tests/cluecode/data/ics/jpeg/coderules.doc.yml
index ad9eaf20d6..4163a33ef8 100644
--- a/tests/cluecode/data/ics/jpeg/coderules.doc.yml
+++ b/tests/cluecode/data/ics/jpeg/coderules.doc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - Copyright (c) 1991-1996, Thomas G. Lane.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/filelist.doc.yml b/tests/cluecode/data/ics/jpeg/filelist.doc.yml
index 4586a6b8ee..0f9b93a5bb 100644
--- a/tests/cluecode/data/ics/jpeg/filelist.doc.yml
+++ b/tests/cluecode/data/ics/jpeg/filelist.doc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - Copyright (c) 1994-1998, Thomas G. Lane.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/install.doc.yml b/tests/cluecode/data/ics/jpeg/install.doc.yml
index 8363ba6437..2d167409bb 100644
--- a/tests/cluecode/data/ics/jpeg/install.doc.yml
+++ b/tests/cluecode/data/ics/jpeg/install.doc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - Copyright (c) 1991-1998, Thomas G. Lane.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/jcapimin.c.yml b/tests/cluecode/data/ics/jpeg/jcapimin.c.yml
index 4586a6b8ee..0f9b93a5bb 100644
--- a/tests/cluecode/data/ics/jpeg/jcapimin.c.yml
+++ b/tests/cluecode/data/ics/jpeg/jcapimin.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - Copyright (c) 1994-1998, Thomas G. Lane.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/jcapistd.c.yml b/tests/cluecode/data/ics/jpeg/jcapistd.c.yml
index b675272b4c..66a55f9ad6 100644
--- a/tests/cluecode/data/ics/jpeg/jcapistd.c.yml
+++ b/tests/cluecode/data/ics/jpeg/jcapistd.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - Copyright (c) 1994-1996, Thomas G. Lane.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/jccolor.c.yml b/tests/cluecode/data/ics/jpeg/jccolor.c.yml
index ad9eaf20d6..4163a33ef8 100644
--- a/tests/cluecode/data/ics/jpeg/jccolor.c.yml
+++ b/tests/cluecode/data/ics/jpeg/jccolor.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - Copyright (c) 1991-1996, Thomas G. Lane.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/jcphuff.c.yml b/tests/cluecode/data/ics/jpeg/jcphuff.c.yml
index 1da654c184..2958518638 100644
--- a/tests/cluecode/data/ics/jpeg/jcphuff.c.yml
+++ b/tests/cluecode/data/ics/jpeg/jcphuff.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - Copyright (c) 1995-1997, Thomas G. Lane.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/jctrans.c.yml b/tests/cluecode/data/ics/jpeg/jctrans.c.yml
index bdadd7f482..81b1b0fe4b 100644
--- a/tests/cluecode/data/ics/jpeg/jctrans.c.yml
+++ b/tests/cluecode/data/ics/jpeg/jctrans.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - Copyright (c) 1995-1998, Thomas G. Lane.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/jmemansi.c.yml b/tests/cluecode/data/ics/jpeg/jmemansi.c.yml
index 091ae89909..c19653268d 100644
--- a/tests/cluecode/data/ics/jpeg/jmemansi.c.yml
+++ b/tests/cluecode/data/ics/jpeg/jmemansi.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - Copyright (c) 1992-1996, Thomas G. Lane.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/jmemdos.c.yml b/tests/cluecode/data/ics/jpeg/jmemdos.c.yml
index dbdad11bf9..91a79a125c 100644
--- a/tests/cluecode/data/ics/jpeg/jmemdos.c.yml
+++ b/tests/cluecode/data/ics/jpeg/jmemdos.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - Copyright (c) 1992-1997, Thomas G. Lane.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/jversion.h.yml b/tests/cluecode/data/ics/jpeg/jversion.h.yml
index f8c246de72..08c45a0287 100644
--- a/tests/cluecode/data/ics/jpeg/jversion.h.yml
+++ b/tests/cluecode/data/ics/jpeg/jversion.h.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Thomas G. Lane
     count: 2
+allrights:
+  - Copyright (c) 1991-1998, Thomas G. Lane.
+  - Copyright (c) 1998, Thomas G. Lane
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/rdcolmap.c.yml b/tests/cluecode/data/ics/jpeg/rdcolmap.c.yml
index 2d5c37a94f..0d3e631605 100644
--- a/tests/cluecode/data/ics/jpeg/rdcolmap.c.yml
+++ b/tests/cluecode/data/ics/jpeg/rdcolmap.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - Copyright (c) 1994-1996, Thomas G. Lane.
+  - Copyright (c) 1988 by Jef Poskanzer.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/rdppm.c.yml b/tests/cluecode/data/ics/jpeg/rdppm.c.yml
index 079700cc0a..cd085dc598 100644
--- a/tests/cluecode/data/ics/jpeg/rdppm.c.yml
+++ b/tests/cluecode/data/ics/jpeg/rdppm.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - Copyright (c) 1991-1997, Thomas G. Lane.
+  - Copyright (c) 1988 by Jef Poskanzer.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/structure.doc.yml b/tests/cluecode/data/ics/jpeg/structure.doc.yml
index 80d1c59062..21ee2b6a41 100644
--- a/tests/cluecode/data/ics/jpeg/structure.doc.yml
+++ b/tests/cluecode/data/ics/jpeg/structure.doc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - Copyright (c) 1991-1995, Thomas G. Lane.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/transupp.c.yml b/tests/cluecode/data/ics/jpeg/transupp.c.yml
index 0a9ec31eb9..de3b2eea4f 100644
--- a/tests/cluecode/data/ics/jpeg/transupp.c.yml
+++ b/tests/cluecode/data/ics/jpeg/transupp.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - Copyright (c) 1997, Thomas G. Lane.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/wrgif.c.yml b/tests/cluecode/data/ics/jpeg/wrgif.c.yml
index 81b329903f..8e4cd7352a 100644
--- a/tests/cluecode/data/ics/jpeg/wrgif.c.yml
+++ b/tests/cluecode/data/ics/jpeg/wrgif.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - Copyright (c) 1991-1997, Thomas G. Lane.
+  - Copyright (c) 1989 by Jef Poskanzer.
+  - Copyright property of CompuServe Incorporated.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jpeg/wrjpgcom.c.yml b/tests/cluecode/data/ics/jpeg/wrjpgcom.c.yml
index 42d963ee87..538e3dfc12 100644
--- a/tests/cluecode/data/ics/jpeg/wrjpgcom.c.yml
+++ b/tests/cluecode/data/ics/jpeg/wrjpgcom.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Thomas G. Lane
     count: 1
+allrights:
+  - Copyright (c) 1994-1997, Thomas G. Lane.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/jsr305/NOTICE.yml b/tests/cluecode/data/ics/jsr305/NOTICE.yml
index cbe7454c8b..a8fbeb24d9 100644
--- a/tests/cluecode/data/ics/jsr305/NOTICE.yml
+++ b/tests/cluecode/data/ics/jsr305/NOTICE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: JSR305 expert group
     count: 1
+allrights:
+  - Copyright (c) 2007-2009, JSR305 expert group All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-asm-arm-arch/vmalloc.h.yml b/tests/cluecode/data/ics/kernel-headers-original-asm-arm-arch/vmalloc.h.yml
index 73af7182f6..3caf9a82e7 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-asm-arm-arch/vmalloc.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-asm-arm-arch/vmalloc.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Russell King
     count: 1
+allrights:
+  - Copyright (c) 2000 Russell King.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-asm-arm/atomic.h.yml b/tests/cluecode/data/ics/kernel-headers-original-asm-arm/atomic.h.yml
index cb30fbc853..0eae1077e6 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-asm-arm/atomic.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-asm-arm/atomic.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Russell King
     count: 1
+allrights:
+  - Copyright (c) 1996 Russell King.
+  - Copyright (c) 2002 Deep Blue Solutions Ltd.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-asm-arm/bitops.h.yml b/tests/cluecode/data/ics/kernel-headers-original-asm-arm/bitops.h.yml
index 7d535c2d80..587ad7cefa 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-asm-arm/bitops.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-asm-arm/bitops.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Russell King
     count: 1
+allrights:
+  - Copyright 1995, Russell King.
+  - Copyright 2001, Nicolas Pitre
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-asm-arm/domain.h.yml b/tests/cluecode/data/ics/kernel-headers-original-asm-arm/domain.h.yml
index 63827aad91..d2b58afe6e 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-asm-arm/domain.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-asm-arm/domain.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Russell King
     count: 1
+allrights:
+  - Copyright (c) 1999 Russell King.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-asm-arm/posix_types.h.yml b/tests/cluecode/data/ics/kernel-headers-original-asm-arm/posix_types.h.yml
index 813639fd56..883a29642d 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-asm-arm/posix_types.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-asm-arm/posix_types.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Russell King
     count: 1
+allrights:
+  - Copyright (c) 1996-1998 Russell King.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-asm-arm/sizes.h.yml b/tests/cluecode/data/ics/kernel-headers-original-asm-arm/sizes.h.yml
index 3d03435f67..ae9dcf6257 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-asm-arm/sizes.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-asm-arm/sizes.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: ARM Limited
     count: 1
+allrights:
+  - Copyright (c) ARM Limited 1998. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-asm-arm/thread_info.h.yml b/tests/cluecode/data/ics/kernel-headers-original-asm-arm/thread_info.h.yml
index 89e6f28ec6..ed89d7a358 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-asm-arm/thread_info.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-asm-arm/thread_info.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Russell King
     count: 1
+allrights:
+  - Copyright (c) 2002 Russell King.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-asm-generic/tlb.h.yml b/tests/cluecode/data/ics/kernel-headers-original-asm-generic/tlb.h.yml
index ec1494fada..0f456347d0 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-asm-generic/tlb.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-asm-generic/tlb.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Red Hat
     count: 1
+allrights:
+  - Copyright 2001 Red Hat, Inc.
+  - Copyright Linus Torvalds and others.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-asm-x86/bitops_32.h.yml b/tests/cluecode/data/ics/kernel-headers-original-asm-x86/bitops_32.h.yml
index a6589817c7..5b44151524 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-asm-x86/bitops_32.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-asm-x86/bitops_32.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Linus Torvalds
     count: 1
+allrights:
+  - Copyright 1992, Linus Torvalds.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-asm-x86/genapic_32.h.yml b/tests/cluecode/data/ics/kernel-headers-original-asm-x86/genapic_32.h.yml
index a5f3549742..f80ce7df73 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-asm-x86/genapic_32.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-asm-x86/genapic_32.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Andi Kleen, SuSE Labs
     count: 1
+allrights:
+  - Copyright 2003 Andi Kleen, SuSE Labs.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux-mtd/flashchip.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux-mtd/flashchip.h.yml
index 9c277d562a..cc0edaaf71 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux-mtd/flashchip.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux-mtd/flashchip.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Red Hat
     count: 1
+allrights:
+  - (c) 2000 Red Hat.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux-sunrpc/gss_asn1.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux-sunrpc/gss_asn1.h.yml
index 58bef1104e..79ef0b43e3 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux-sunrpc/gss_asn1.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux-sunrpc/gss_asn1.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: the Massachusetts Institute of Technology
     count: 1
+allrights:
+  - Copyright (c) 2000 The Regents of the University of Michigan. All rights reserved.
+  - Copyright 1995 by the Massachusetts Institute of Technology. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux-sunrpc/gss_err.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux-sunrpc/gss_err.h.yml
index 5fecb547d4..47e65b17c1 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux-sunrpc/gss_err.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux-sunrpc/gss_err.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The Regents of the University of Michigan
     count: 1
+allrights:
+  - Copyright (c) 2002 The Regents of the University of Michigan. All rights reserved.
+  - Copyright 1993 by OpenVision Technologies, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/a1026.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/a1026.h.yml
index a7e761dcea..1d6eee95ed 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/a1026.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/a1026.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: HTC Corporation
     count: 1
+allrights:
+  - Copyright (c) 2009 HTC Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/aio_abi.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/aio_abi.h.yml
index 7cb00f3653..9ce23c10b3 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/aio_abi.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/aio_abi.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Red Hat
     count: 1
+allrights:
+  - Copyright 2000,2001,2002 Red Hat.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/ata.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/ata.h.yml
index 0ab18b69cc..cafe568e00 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/ata.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/ata.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Red Hat
     count: 1
+allrights:
+  - Copyright 2003-2004 Red Hat, Inc. All rights reserved.
+  - Copyright 2003-2004 Jeff Garzik
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/clk.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/clk.h.yml
index dd92af1e82..06acb9780a 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/clk.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/clk.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: ARM Limited
     count: 1
+allrights:
+  - Copyright (c) 2004 ARM Limited.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/coda.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/coda.h.yml
index 307c5b07fa..cb4b665e34 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/coda.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/coda.h.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Carnegie Mellon University
     count: 2
+allrights:
+  - Copyright (c) 1987-1999 Carnegie Mellon University
+  - Copyright (c) 1987-1999 Carnegie Mellon University All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/dm-ioctl.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/dm-ioctl.h.yml
index c7c7018fc8..9eef982ea8 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/dm-ioctl.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/dm-ioctl.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Sistina Software (UK) Limited
     count: 1
+allrights:
+  - Copyright (c) 2001 - 2003 Sistina Software (UK) Limited.
+  - Copyright (c) 2004 - 2005 Red Hat, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/dmaengine.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/dmaengine.h.yml
index c96ae0998b..3bf71876e5 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/dmaengine.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/dmaengine.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Intel Corporation
     count: 1
+allrights:
+  - Copyright (c) 2004 - 2006 Intel Corporation. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/ftape.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/ftape.h.yml
index f451253254..af18c0a835 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/ftape.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/ftape.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Claus-Justus Heine
     count: 1
+allrights:
+  - Copyright (c) 1994-1996 Bas Laarhoven
+  - (c) 1996-1997 Claus-Justus Heine.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/hil.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/hil.h.yml
index b2d699cc4c..631ad7e90f 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/hil.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/hil.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Brian S. Julin
     count: 1
+allrights:
+  - Copyright (c) 2001 Brian S. Julin All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/if_ppp.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/if_ppp.h.yml
index 7662d011bd..f62da062a5 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/if_ppp.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/if_ppp.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Carnegie Mellon University
     count: 1
+allrights:
+  - Copyright (c) 1989 Carnegie Mellon University. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/jbd.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/jbd.h.yml
index 31e8452857..c084621269 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/jbd.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/jbd.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Red Hat
     count: 1
+allrights:
+  - Copyright 1998-2000 Red Hat, Inc -- All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/kxtf9.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/kxtf9.h.yml
index 8adb14132f..2ef4241e6c 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/kxtf9.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/kxtf9.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Kionix, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2008-2009, Kionix, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/leds-an30259a.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/leds-an30259a.h.yml
index 3d11ea6571..2a41841472 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/leds-an30259a.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/leds-an30259a.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Samsung Electronics Co. Ltd.
     count: 1
+allrights:
+  - Copyright (c) 2011 Samsung Electronics Co. Ltd. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/lis331dlh.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/lis331dlh.h.yml
index b0294a6134..785228e2ae 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/lis331dlh.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/lis331dlh.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Motorola
     count: 1
+allrights:
+  - Copyright (c) 2008-2009, Motorola, All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/loop.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/loop.h.yml
index 7e60499c21..3ac21dcda7 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/loop.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/loop.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Theodore Ts'o
     count: 1
+allrights:
+  - Copyright 1993 by Theodore Ts'o.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/msm_q6vdec.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/msm_q6vdec.h.yml
index 4f72253063..8564b9898a 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/msm_q6vdec.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/msm_q6vdec.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Code Aurora Forum
     count: 1
+allrights:
+  - Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/msm_vidc_dec.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/msm_vidc_dec.h.yml
index ba1950fc27..bdc93d1622 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/msm_vidc_dec.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/msm_vidc_dec.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Code Aurora Forum
     count: 1
+allrights:
+  - Copyright (c) 2010, Code Aurora Forum. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/msm_vidc_enc.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/msm_vidc_enc.h.yml
index ba66a88cb4..121fc132b3 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/msm_vidc_enc.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/msm_vidc_enc.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Code Aurora Forum
     count: 1
+allrights:
+  - Copyright (c) 2009, Code Aurora Forum. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/mt9t013.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/mt9t013.h.yml
index 5debc0217a..5930eac1d4 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/mt9t013.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/mt9t013.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: HTC, Inc
     count: 1
+allrights:
+  - Copyright (c) 2007, 2008 HTC, Inc All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/nfs4.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/nfs4.h.yml
index 9e841d8aae..e40c353ad8 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/nfs4.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/nfs4.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of Michigan
     count: 1
+allrights:
+  - Copyright (c) 2002 The Regents of the University of Michigan. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/nvhdcp.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/nvhdcp.h.yml
index 36d1060afe..9c70b7721a 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/nvhdcp.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/nvhdcp.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: NVIDIA Corporation
     count: 1
+allrights:
+  - Copyright (c) 2010-2011, NVIDIA Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/ppp_defs.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/ppp_defs.h.yml
index ca9904e1a6..7aaf36c120 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/ppp_defs.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/ppp_defs.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Australian National University
     count: 1
+allrights:
+  - Copyright (c) 1994 The Australian National University. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/qic117.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/qic117.h.yml
index 0fd0c89521..9ee3b5022a 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/qic117.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/qic117.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Claus-Justus Heine
     count: 1
+allrights:
+  - Copyright (c) 1993-1996 Bas Laarhoven
+  - (c) 1997 Claus-Justus Heine.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/quota.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/quota.h.yml
index 0c0c381783..9c2fa7d47d 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/quota.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/quota.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1982, 1986 Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/rpmsg_omx.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/rpmsg_omx.h.yml
index cf831c805c..5a654aedf7 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/rpmsg_omx.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/rpmsg_omx.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Texas Instruments
     count: 1
+allrights:
+  - Copyright (c) 2011 Texas Instruments. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/serial_reg.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/serial_reg.h.yml
index 0617973719..1705a45e03 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/serial_reg.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/serial_reg.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Theodore Ts'o
     count: 1
+allrights:
+  - Copyright (c) 1992, 1994 by Theodore Ts'o.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/wireless.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/wireless.h.yml
index 1ad9094855..ab37fd3674 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/wireless.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/wireless.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jean Tourrilhes
     count: 1
+allrights:
+  - Copyright (c) 1997-2006 Jean Tourrilhes, All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/xattr.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/xattr.h.yml
index 3b176664d3..c7bdcf1d0a 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/xattr.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/xattr.h.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Silicon Graphics, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2001 by Andreas Gruenbacher <a.gruenbacher@computer.org>
+  - Copyright (c) 2001-2002 Silicon Graphics, Inc. All Rights Reserved.
+  - Copyright (c) 2004 Red Hat, Inc., James Morris <jmorris@redhat.com>
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/kernel-headers-original-linux/zconf.h.yml b/tests/cluecode/data/ics/kernel-headers-original-linux/zconf.h.yml
index d490f15e2e..592b24b4e0 100644
--- a/tests/cluecode/data/ics/kernel-headers-original-linux/zconf.h.yml
+++ b/tests/cluecode/data/ics/kernel-headers-original-linux/zconf.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jean-loup Gailly
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Jean-loup Gailly.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libffi-src-m32r/ffitarget.h.yml b/tests/cluecode/data/ics/libffi-src-m32r/ffitarget.h.yml
index e744deb7fe..c6f7325ce7 100644
--- a/tests/cluecode/data/ics/libffi-src-m32r/ffitarget.h.yml
+++ b/tests/cluecode/data/ics/libffi-src-m32r/ffitarget.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Renesas Technology
     count: 1
+allrights:
+  - Copyright (c) 2004 Renesas Technology.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libffi/LICENSE.yml b/tests/cluecode/data/ics/libffi/LICENSE.yml
index 634302c1f4..badc22f808 100644
--- a/tests/cluecode/data/ics/libffi/LICENSE.yml
+++ b/tests/cluecode/data/ics/libffi/LICENSE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Red Hat, Inc and others
     count: 1
+allrights:
+  - Copyright (c) 1996-2008 Red Hat, Inc and others.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libgsm-inc/config.h.yml b/tests/cluecode/data/ics/libgsm-inc/config.h.yml
index f7d52a663e..5803094066 100644
--- a/tests/cluecode/data/ics/libgsm-inc/config.h.yml
+++ b/tests/cluecode/data/ics/libgsm-inc/config.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jutta Degener and Carsten Bormann, Technische Universitaet Berlin
     count: 1
+allrights:
+  - Copyright 1992 by Jutta Degener and Carsten Bormann, Technische Universitaet Berlin.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libgsm-man/gsm.3.yml b/tests/cluecode/data/ics/libgsm-man/gsm.3.yml
index f7d52a663e..5803094066 100644
--- a/tests/cluecode/data/ics/libgsm-man/gsm.3.yml
+++ b/tests/cluecode/data/ics/libgsm-man/gsm.3.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jutta Degener and Carsten Bormann, Technische Universitaet Berlin
     count: 1
+allrights:
+  - Copyright 1992 by Jutta Degener and Carsten Bormann, Technische Universitaet Berlin.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libgsm-man/gsm_option.3.yml b/tests/cluecode/data/ics/libgsm-man/gsm_option.3.yml
index 8bdd2170b0..9c93ccbf1d 100644
--- a/tests/cluecode/data/ics/libgsm-man/gsm_option.3.yml
+++ b/tests/cluecode/data/ics/libgsm-man/gsm_option.3.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jutta Degener and Carsten Bormann, Technische Universitaet Berlin
     count: 1
+allrights:
+  - Copyright 1992-1995 by Jutta Degener and Carsten Bormann, Technische Universitaet Berlin.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libgsm/ChangeLog.yml b/tests/cluecode/data/ics/libgsm/ChangeLog.yml
index f7d52a663e..5803094066 100644
--- a/tests/cluecode/data/ics/libgsm/ChangeLog.yml
+++ b/tests/cluecode/data/ics/libgsm/ChangeLog.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jutta Degener and Carsten Bormann, Technische Universitaet Berlin
     count: 1
+allrights:
+  - Copyright 1992 by Jutta Degener and Carsten Bormann, Technische Universitaet Berlin.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libgsm/README.yml b/tests/cluecode/data/ics/libgsm/README.yml
index f7d52a663e..5803094066 100644
--- a/tests/cluecode/data/ics/libgsm/README.yml
+++ b/tests/cluecode/data/ics/libgsm/README.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jutta Degener and Carsten Bormann, Technische Universitaet Berlin
     count: 1
+allrights:
+  - Copyright 1992 by Jutta Degener and Carsten Bormann, Technische Universitaet Berlin.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap-doc/pcap.html.yml b/tests/cluecode/data/ics/libpcap-doc/pcap.html.yml
index ba36c4ea93..9f69db9285 100644
--- a/tests/cluecode/data/ics/libpcap-doc/pcap.html.yml
+++ b/tests/cluecode/data/ics/libpcap-doc/pcap.html.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: The Internet Society
     count: 2
+allrights:
+  - Copyright (c) The Internet Society (2004). All Rights Reserved.
+  - Copyright (c) The Internet Society (2004). All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap-doc/pcap.txt.yml b/tests/cluecode/data/ics/libpcap-doc/pcap.txt.yml
index ba36c4ea93..9f69db9285 100644
--- a/tests/cluecode/data/ics/libpcap-doc/pcap.txt.yml
+++ b/tests/cluecode/data/ics/libpcap-doc/pcap.txt.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: The Internet Society
     count: 2
+allrights:
+  - Copyright (c) The Internet Society (2004). All Rights Reserved.
+  - Copyright (c) The Internet Society (2004). All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap-lbl/os-sunos4.h.yml b/tests/cluecode/data/ics/libpcap-lbl/os-sunos4.h.yml
index b5238fd21d..9d19f6e28d 100644
--- a/tests/cluecode/data/ics/libpcap-lbl/os-sunos4.h.yml
+++ b/tests/cluecode/data/ics/libpcap-lbl/os-sunos4.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1989, 1990, 1993, 1994, 1995, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap-lbl/os-ultrix4.h.yml b/tests/cluecode/data/ics/libpcap-lbl/os-ultrix4.h.yml
index 5469b7753f..ed6788e42b 100644
--- a/tests/cluecode/data/ics/libpcap-lbl/os-ultrix4.h.yml
+++ b/tests/cluecode/data/ics/libpcap-lbl/os-ultrix4.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1990, 1993, 1994, 1995, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap-missing/snprintf.c.yml b/tests/cluecode/data/ics/libpcap-missing/snprintf.c.yml
index ea1114b7d2..4e9cd1874c 100644
--- a/tests/cluecode/data/ics/libpcap-missing/snprintf.c.yml
+++ b/tests/cluecode/data/ics/libpcap-missing/snprintf.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Kungliga Tekniska Hogskolan (Royal Institute of Technology, Stockholm, Sweden)
     count: 1
+allrights:
+  - Copyright (c) 1995-1999 Kungliga Tekniska Hogskolan (Royal Institute of Technology, Stockholm, Sweden). All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/Makefile.in.yml b/tests/cluecode/data/ics/libpcap/Makefile.in.yml
index 43ddee89b5..46e7362ae5 100644
--- a/tests/cluecode/data/ics/libpcap/Makefile.in.yml
+++ b/tests/cluecode/data/ics/libpcap/Makefile.in.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1993, 1994, 1995, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/aclocal.m4.yml b/tests/cluecode/data/ics/libpcap/aclocal.m4.yml
index 4d0136af02..ce164183fc 100644
--- a/tests/cluecode/data/ics/libpcap/aclocal.m4.yml
+++ b/tests/cluecode/data/ics/libpcap/aclocal.m4.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997, 1998 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/atmuni31.h.yml b/tests/cluecode/data/ics/libpcap/atmuni31.h.yml
index 5d12870a6a..b7d048c001 100644
--- a/tests/cluecode/data/ics/libpcap/atmuni31.h.yml
+++ b/tests/cluecode/data/ics/libpcap/atmuni31.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Yen Yen Lim and North Dakota State University
     count: 1
+allrights:
+  - Copyright (c) 1997 Yen Yen Lim and North Dakota State University All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/bpf_dump.c.yml b/tests/cluecode/data/ics/libpcap/bpf_dump.c.yml
index b8c9317eae..ecbbfe8ecb 100644
--- a/tests/cluecode/data/ics/libpcap/bpf_dump.c.yml
+++ b/tests/cluecode/data/ics/libpcap/bpf_dump.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1992, 1993, 1994, 1995, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/bpf_image.c.yml b/tests/cluecode/data/ics/libpcap/bpf_image.c.yml
index 9c0dca47b6..36c898ae94 100644
--- a/tests/cluecode/data/ics/libpcap/bpf_image.c.yml
+++ b/tests/cluecode/data/ics/libpcap/bpf_image.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1990, 1991, 1992, 1994, 1995, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/configure.in.yml b/tests/cluecode/data/ics/libpcap/configure.in.yml
index 10f8f0b4d1..dde435036e 100644
--- a/tests/cluecode/data/ics/libpcap/configure.in.yml
+++ b/tests/cluecode/data/ics/libpcap/configure.in.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1994, 1995, 1996, 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/etherent.c.yml b/tests/cluecode/data/ics/libpcap/etherent.c.yml
index 5469b7753f..ed6788e42b 100644
--- a/tests/cluecode/data/ics/libpcap/etherent.c.yml
+++ b/tests/cluecode/data/ics/libpcap/etherent.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1990, 1993, 1994, 1995, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/ethertype.h.yml b/tests/cluecode/data/ics/libpcap/ethertype.h.yml
index 06dec4c15f..a40f9fc692 100644
--- a/tests/cluecode/data/ics/libpcap/ethertype.h.yml
+++ b/tests/cluecode/data/ics/libpcap/ethertype.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1993, 1994, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/fad-getad.c.yml b/tests/cluecode/data/ics/libpcap/fad-getad.c.yml
index 95fd04bb8d..51f1c5ca43 100644
--- a/tests/cluecode/data/ics/libpcap/fad-getad.c.yml
+++ b/tests/cluecode/data/ics/libpcap/fad-getad.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1994, 1995, 1996, 1997, 1998 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/fad-win32.c.yml b/tests/cluecode/data/ics/libpcap/fad-win32.c.yml
index c431e305c4..570ecd455c 100644
--- a/tests/cluecode/data/ics/libpcap/fad-win32.c.yml
+++ b/tests/cluecode/data/ics/libpcap/fad-win32.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: NetGroup, Politecnico di Torino (Italy)
     count: 1
+allrights:
+  - Copyright (c) 2002 - 2005 NetGroup, Politecnico di Torino (Italy)
+  - Copyright (c) 2005 - 2006 CACE Technologies, Davis (California) All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/gencode.c.yml b/tests/cluecode/data/ics/libpcap/gencode.c.yml
index 59446f9d18..74b9b32555 100644
--- a/tests/cluecode/data/ics/libpcap/gencode.c.yml
+++ b/tests/cluecode/data/ics/libpcap/gencode.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/gencode.h.yml b/tests/cluecode/data/ics/libpcap/gencode.h.yml
index 14e90cb2e5..812905afc6 100644
--- a/tests/cluecode/data/ics/libpcap/gencode.h.yml
+++ b/tests/cluecode/data/ics/libpcap/gencode.h.yml
@@ -14,3 +14,6 @@ holders_summary:
     count: 1
   - value: Yen Yen Lim and North Dakota State University
     count: 1
+allrights:
+  - Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 1997 Yen Yen Lim and North Dakota State University All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/grammar.c.yml b/tests/cluecode/data/ics/libpcap/grammar.c.yml
index 54c8160525..f58eb1b4b1 100644
--- a/tests/cluecode/data/ics/libpcap/grammar.c.yml
+++ b/tests/cluecode/data/ics/libpcap/grammar.c.yml
@@ -15,3 +15,6 @@ holders_summary:
     count: 1
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+  - Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/llc.h.yml b/tests/cluecode/data/ics/libpcap/llc.h.yml
index c182afcc69..adf19d9dfc 100644
--- a/tests/cluecode/data/ics/libpcap/llc.h.yml
+++ b/tests/cluecode/data/ics/libpcap/llc.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1993, 1994, 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/mkdep.yml b/tests/cluecode/data/ics/libpcap/mkdep.yml
index 1ecdcefb39..4230495c3a 100644
--- a/tests/cluecode/data/ics/libpcap/mkdep.yml
+++ b/tests/cluecode/data/ics/libpcap/mkdep.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1994, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/nlpid.h.yml b/tests/cluecode/data/ics/libpcap/nlpid.h.yml
index eb226bc443..569292248f 100644
--- a/tests/cluecode/data/ics/libpcap/nlpid.h.yml
+++ b/tests/cluecode/data/ics/libpcap/nlpid.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Juniper Networks, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1996 Juniper Networks, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/optimize.c.yml b/tests/cluecode/data/ics/libpcap/optimize.c.yml
index 862e2c8e62..cc31a3b77f 100644
--- a/tests/cluecode/data/ics/libpcap/optimize.c.yml
+++ b/tests/cluecode/data/ics/libpcap/optimize.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994, 1995, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/pcap-bpf.c.yml b/tests/cluecode/data/ics/libpcap/pcap-bpf.c.yml
index d661a32ff1..cd7ff3307a 100644
--- a/tests/cluecode/data/ics/libpcap/pcap-bpf.c.yml
+++ b/tests/cluecode/data/ics/libpcap/pcap-bpf.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1993, 1994, 1995, 1996, 1998 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/pcap-bpf.h.yml b/tests/cluecode/data/ics/libpcap/pcap-bpf.h.yml
index 95aae285c3..6250bab538 100644
--- a/tests/cluecode/data/ics/libpcap/pcap-bpf.h.yml
+++ b/tests/cluecode/data/ics/libpcap/pcap-bpf.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/pcap-dlpi.c.yml b/tests/cluecode/data/ics/libpcap/pcap-dlpi.c.yml
index 860b755f34..f0752f6ef8 100644
--- a/tests/cluecode/data/ics/libpcap/pcap-dlpi.c.yml
+++ b/tests/cluecode/data/ics/libpcap/pcap-dlpi.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1993, 1994, 1995, 1996, 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/pcap-int.h.yml b/tests/cluecode/data/ics/libpcap/pcap-int.h.yml
index 89910deff3..ff3b8ceb30 100644
--- a/tests/cluecode/data/ics/libpcap/pcap-int.h.yml
+++ b/tests/cluecode/data/ics/libpcap/pcap-int.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1994, 1995, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/pcap-namedb.h.yml b/tests/cluecode/data/ics/libpcap/pcap-namedb.h.yml
index 1ecdcefb39..4230495c3a 100644
--- a/tests/cluecode/data/ics/libpcap/pcap-namedb.h.yml
+++ b/tests/cluecode/data/ics/libpcap/pcap-namedb.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1994, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/pcap-nit.c.yml b/tests/cluecode/data/ics/libpcap/pcap-nit.c.yml
index edf038be72..ae649669ff 100644
--- a/tests/cluecode/data/ics/libpcap/pcap-nit.c.yml
+++ b/tests/cluecode/data/ics/libpcap/pcap-nit.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/pcap-nit.h.yml b/tests/cluecode/data/ics/libpcap/pcap-nit.h.yml
index f13ae88963..22f1f5632a 100644
--- a/tests/cluecode/data/ics/libpcap/pcap-nit.h.yml
+++ b/tests/cluecode/data/ics/libpcap/pcap-nit.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1990, 1994 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/pcap-null.c.yml b/tests/cluecode/data/ics/libpcap/pcap-null.c.yml
index 89910deff3..ff3b8ceb30 100644
--- a/tests/cluecode/data/ics/libpcap/pcap-null.c.yml
+++ b/tests/cluecode/data/ics/libpcap/pcap-null.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1994, 1995, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/pcap-stdinc.h.yml b/tests/cluecode/data/ics/libpcap/pcap-stdinc.h.yml
index aaafadd051..40ebf26528 100644
--- a/tests/cluecode/data/ics/libpcap/pcap-stdinc.h.yml
+++ b/tests/cluecode/data/ics/libpcap/pcap-stdinc.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: NetGroup, Politecnico di Torino (Italy)
     count: 1
+allrights:
+  - Copyright (c) 2002 - 2003 NetGroup, Politecnico di Torino (Italy) All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/pcap-win32.c.yml b/tests/cluecode/data/ics/libpcap/pcap-win32.c.yml
index af68e6be62..072a6574df 100644
--- a/tests/cluecode/data/ics/libpcap/pcap-win32.c.yml
+++ b/tests/cluecode/data/ics/libpcap/pcap-win32.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: NetGroup, Politecnico di Torino (Italy)
     count: 1
+allrights:
+  - Copyright (c) 1999 - 2005 NetGroup, Politecnico di Torino (Italy)
+  - Copyright (c) 2005 - 2007 CACE Technologies, Davis (California) All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/pcap.3.yml b/tests/cluecode/data/ics/libpcap/pcap.3.yml
index a08933db3b..276ee756d6 100644
--- a/tests/cluecode/data/ics/libpcap/pcap.3.yml
+++ b/tests/cluecode/data/ics/libpcap/pcap.3.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1994, 1996, 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/pcap.c.yml b/tests/cluecode/data/ics/libpcap/pcap.c.yml
index c614801e0c..568a28853e 100644
--- a/tests/cluecode/data/ics/libpcap/pcap.c.yml
+++ b/tests/cluecode/data/ics/libpcap/pcap.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/pcap.h.yml b/tests/cluecode/data/ics/libpcap/pcap.h.yml
index 860b755f34..f0752f6ef8 100644
--- a/tests/cluecode/data/ics/libpcap/pcap.h.yml
+++ b/tests/cluecode/data/ics/libpcap/pcap.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1993, 1994, 1995, 1996, 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/ppp.h.yml b/tests/cluecode/data/ics/libpcap/ppp.h.yml
index 4cb6ce0c3b..4166bf1c25 100644
--- a/tests/cluecode/data/ics/libpcap/ppp.h.yml
+++ b/tests/cluecode/data/ics/libpcap/ppp.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Carnegie Mellon
     count: 1
+allrights:
+  - Copyright 1989 by Carnegie Mellon.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libpcap/scanner.c.yml b/tests/cluecode/data/ics/libpcap/scanner.c.yml
index 9078088ca8..2b9a6907fc 100644
--- a/tests/cluecode/data/ics/libpcap/scanner.c.yml
+++ b/tests/cluecode/data/ics/libpcap/scanner.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libvpx-build-x86-msvs/obj_int_extract.bat.yml b/tests/cluecode/data/ics/libvpx-build-x86-msvs/obj_int_extract.bat.yml
index d586c4b762..5d9383b6a5 100644
--- a/tests/cluecode/data/ics/libvpx-build-x86-msvs/obj_int_extract.bat.yml
+++ b/tests/cluecode/data/ics/libvpx-build-x86-msvs/obj_int_extract.bat.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The WebM project authors
     count: 1
+allrights:
+  - Copyright (c) 2011 The WebM project authors. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libvpx-examples-includes-HTML-Toc-0.91/Toc.pod.yml b/tests/cluecode/data/ics/libvpx-examples-includes-HTML-Toc-0.91/Toc.pod.yml
index 43564b7f2c..f161730423 100644
--- a/tests/cluecode/data/ics/libvpx-examples-includes-HTML-Toc-0.91/Toc.pod.yml
+++ b/tests/cluecode/data/ics/libvpx-examples-includes-HTML-Toc-0.91/Toc.pod.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Freddy Vulto
     count: 1
+allrights:
+  - Copyright (c) 2001 Freddy Vulto. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libvpx-examples-includes-PHP-Markdown-Extra-1.2.3/License.text.yml b/tests/cluecode/data/ics/libvpx-examples-includes-PHP-Markdown-Extra-1.2.3/License.text.yml
index 18c63e0833..64353ec86f 100644
--- a/tests/cluecode/data/ics/libvpx-examples-includes-PHP-Markdown-Extra-1.2.3/License.text.yml
+++ b/tests/cluecode/data/ics/libvpx-examples-includes-PHP-Markdown-Extra-1.2.3/License.text.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Michel Fortin
     count: 1
+allrights:
+  - Copyright (c) 2004-2008 Michel Fortin http://www.michelf.com/ All rights reserved.
+  - Copyright (c) 2003-2006 John Gruber http://daringfireball.net/ All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libvpx-examples-includes-PHP-Markdown-Extra-1.2.3/PHP_Markdown_Extra_Readme.text.yml b/tests/cluecode/data/ics/libvpx-examples-includes-PHP-Markdown-Extra-1.2.3/PHP_Markdown_Extra_Readme.text.yml
index 9c9e912efa..63091b1b09 100644
--- a/tests/cluecode/data/ics/libvpx-examples-includes-PHP-Markdown-Extra-1.2.3/PHP_Markdown_Extra_Readme.text.yml
+++ b/tests/cluecode/data/ics/libvpx-examples-includes-PHP-Markdown-Extra-1.2.3/PHP_Markdown_Extra_Readme.text.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Michel Fortin
     count: 1
+allrights:
+  - Copyright (c) 2004-2005 Michel Fortin http://www.michelf.com/ All rights reserved.
+  - Copyright (c) 2003-2005 John Gruber http://daringfireball.net/ All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libvpx-examples-includes-PHP-Markdown-Extra-1.2.3/markdown.php.yml b/tests/cluecode/data/ics/libvpx-examples-includes-PHP-Markdown-Extra-1.2.3/markdown.php.yml
index ab753630f6..5f9165e1bc 100644
--- a/tests/cluecode/data/ics/libvpx-examples-includes-PHP-Markdown-Extra-1.2.3/markdown.php.yml
+++ b/tests/cluecode/data/ics/libvpx-examples-includes-PHP-Markdown-Extra-1.2.3/markdown.php.yml
@@ -18,3 +18,8 @@ holders_summary:
   - value: Michel Fortin
     count: 2
 notes: we do not want a trailing http
+allrights:
+  - Copyright (c) 2004-2008 Michel Fortin http://www.michelf.com/projects/php-markdown
+  - Copyright (c) 2004-2006 John Gruber http://daringfireball.net/projects/markdown
+  - Copyright (c) 2004-2008 Michel Fortin http://www.michelf.com All rights reserved.
+  - Copyright (c) 2003-2006 John Gruber http://daringfireball.net All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libvpx-examples-includes-PHP-SmartyPants-1.5.1e/PHP_SmartyPants_Readme.txt.yml b/tests/cluecode/data/ics/libvpx-examples-includes-PHP-SmartyPants-1.5.1e/PHP_SmartyPants_Readme.txt.yml
index be8109fc9c..a3d231575a 100644
--- a/tests/cluecode/data/ics/libvpx-examples-includes-PHP-SmartyPants-1.5.1e/PHP_SmartyPants_Readme.txt.yml
+++ b/tests/cluecode/data/ics/libvpx-examples-includes-PHP-SmartyPants-1.5.1e/PHP_SmartyPants_Readme.txt.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Michel Fortin
     count: 1
+allrights:
+  - Copyright (c) 2005 Michel Fortin http://www.michelf.com/ All rights reserved.
+  - Copyright (c) 2003-2004 John Gruber http://daringfireball.net/ All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libvpx-examples-includes-PHP-SmartyPants-1.5.1e/smartypants.php.yml b/tests/cluecode/data/ics/libvpx-examples-includes-PHP-SmartyPants-1.5.1e/smartypants.php.yml
index e05548a626..901ab744a0 100644
--- a/tests/cluecode/data/ics/libvpx-examples-includes-PHP-SmartyPants-1.5.1e/smartypants.php.yml
+++ b/tests/cluecode/data/ics/libvpx-examples-includes-PHP-SmartyPants-1.5.1e/smartypants.php.yml
@@ -17,3 +17,8 @@ holders_summary:
     count: 2
   - value: Michel Fortin
     count: 2
+allrights:
+  - Copyright (c) 2003-2004 John Gruber
+  - Copyright (c) 2004-2005 Michel Fortin
+  - Copyright (c) 2003 John Gruber http://daringfireball.net All rights reserved.
+  - Copyright (c) 2004-2005 Michel Fortin http://www.michelf.com
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libvpx-libmkv/EbmlIDs.h.yml b/tests/cluecode/data/ics/libvpx-libmkv/EbmlIDs.h.yml
index f3151de348..9e90a0b073 100644
--- a/tests/cluecode/data/ics/libvpx-libmkv/EbmlIDs.h.yml
+++ b/tests/cluecode/data/ics/libvpx-libmkv/EbmlIDs.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The WebM project authors
     count: 1
+allrights:
+  - Copyright (c) 2010 The WebM project authors. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libvpx-nestegg-halloc-src/halloc.c.yml b/tests/cluecode/data/ics/libvpx-nestegg-halloc-src/halloc.c.yml
index 7f2d618146..d8292d1e72 100644
--- a/tests/cluecode/data/ics/libvpx-nestegg-halloc-src/halloc.c.yml
+++ b/tests/cluecode/data/ics/libvpx-nestegg-halloc-src/halloc.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Alex Pankratov
     count: 1
+allrights:
+  - Copyright (c) 2004i-2010 Alex Pankratov. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libvpx-nestegg-halloc/README.yml b/tests/cluecode/data/ics/libvpx-nestegg-halloc/README.yml
index ddcdec8ae0..e69de758f5 100644
--- a/tests/cluecode/data/ics/libvpx-nestegg-halloc/README.yml
+++ b/tests/cluecode/data/ics/libvpx-nestegg-halloc/README.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Alex Pankratov
     count: 1
+allrights:
+  - Copyright (c) 2004-2010, Alex Pankratov (ap@swapped.cc). All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libvpx-nestegg-halloc/halloc.h.yml b/tests/cluecode/data/ics/libvpx-nestegg-halloc/halloc.h.yml
index d9c9f1efea..8da9489c5b 100644
--- a/tests/cluecode/data/ics/libvpx-nestegg-halloc/halloc.h.yml
+++ b/tests/cluecode/data/ics/libvpx-nestegg-halloc/halloc.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Alex Pankratov
     count: 1
+allrights:
+  - Copyright (c) 2004-2010 Alex Pankratov. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libvpx-vp8-common/asm_com_offsets.c.yml b/tests/cluecode/data/ics/libvpx-vp8-common/asm_com_offsets.c.yml
index d586c4b762..5d9383b6a5 100644
--- a/tests/cluecode/data/ics/libvpx-vp8-common/asm_com_offsets.c.yml
+++ b/tests/cluecode/data/ics/libvpx-vp8-common/asm_com_offsets.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The WebM project authors
     count: 1
+allrights:
+  - Copyright (c) 2011 The WebM project authors. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libvpx/LICENSE.yml b/tests/cluecode/data/ics/libvpx/LICENSE.yml
index a010550ea0..6d1724e9aa 100644
--- a/tests/cluecode/data/ics/libvpx/LICENSE.yml
+++ b/tests/cluecode/data/ics/libvpx/LICENSE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright (c) 2010, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libvpx/args.c.yml b/tests/cluecode/data/ics/libvpx/args.c.yml
index f3151de348..9e90a0b073 100644
--- a/tests/cluecode/data/ics/libvpx/args.c.yml
+++ b/tests/cluecode/data/ics/libvpx/args.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The WebM project authors
     count: 1
+allrights:
+  - Copyright (c) 2010 The WebM project authors. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libvpx/docs.mk.yml b/tests/cluecode/data/ics/libvpx/docs.mk.yml
index f3151de348..9e90a0b073 100644
--- a/tests/cluecode/data/ics/libvpx/docs.mk.yml
+++ b/tests/cluecode/data/ics/libvpx/docs.mk.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The WebM project authors
     count: 1
+allrights:
+  - Copyright (c) 2010 The WebM project authors. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libvpx/y4minput.c.yml b/tests/cluecode/data/ics/libvpx/y4minput.c.yml
index 89b43be941..9cbcb862d7 100644
--- a/tests/cluecode/data/ics/libvpx/y4minput.c.yml
+++ b/tests/cluecode/data/ics/libvpx/y4minput.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The Xiph.Org Foundation and contributors
     count: 1
+allrights:
+  - Copyright (c) 2010 The WebM project authors. All Rights Reserved.
+  - Copyright (c) 2002-2010 The Xiph.Org Foundation and contributors.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libxml2/NOTICE.yml b/tests/cluecode/data/ics/libxml2/NOTICE.yml
index bae7247d57..41e95fb72e 100644
--- a/tests/cluecode/data/ics/libxml2/NOTICE.yml
+++ b/tests/cluecode/data/ics/libxml2/NOTICE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Daniel Veillard
     count: 1
+allrights:
+  - Copyright (c) 1998-2003 Daniel Veillard. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libxml2/dict.c.yml b/tests/cluecode/data/ics/libxml2/dict.c.yml
index 48500e6383..ac59622268 100644
--- a/tests/cluecode/data/ics/libxml2/dict.c.yml
+++ b/tests/cluecode/data/ics/libxml2/dict.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Daniel Veillard
     count: 1
+allrights:
+  - Copyright (c) 2003 Daniel Veillard.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libxml2/hash.c.yml b/tests/cluecode/data/ics/libxml2/hash.c.yml
index a5292ee4aa..66420b4396 100644
--- a/tests/cluecode/data/ics/libxml2/hash.c.yml
+++ b/tests/cluecode/data/ics/libxml2/hash.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Bjorn Reese and Daniel Veillard
     count: 1
+allrights:
+  - Copyright (c) 2000 Bjorn Reese and Daniel Veillard.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libxml2/list.c.yml b/tests/cluecode/data/ics/libxml2/list.c.yml
index 5243143914..daac622142 100644
--- a/tests/cluecode/data/ics/libxml2/list.c.yml
+++ b/tests/cluecode/data/ics/libxml2/list.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Gary Pennington and Daniel Veillard
     count: 1
+allrights:
+  - Copyright (c) 2000 Gary Pennington and Daniel Veillard.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libxml2/trio.c.yml b/tests/cluecode/data/ics/libxml2/trio.c.yml
index ba71ed1160..5d856fad52 100644
--- a/tests/cluecode/data/ics/libxml2/trio.c.yml
+++ b/tests/cluecode/data/ics/libxml2/trio.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Bjorn Reese and Daniel Stenberg
     count: 1
+allrights:
+  - Copyright (c) 1998 Bjorn Reese and Daniel Stenberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libxml2/triop.h.yml b/tests/cluecode/data/ics/libxml2/triop.h.yml
index 53076b01d3..b6dc152f2f 100644
--- a/tests/cluecode/data/ics/libxml2/triop.h.yml
+++ b/tests/cluecode/data/ics/libxml2/triop.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Bjorn Reese and Daniel Stenberg
     count: 1
+allrights:
+  - Copyright (c) 2000 Bjorn Reese and Daniel Stenberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libxml2/triostr.c.yml b/tests/cluecode/data/ics/libxml2/triostr.c.yml
index 5fd2f51193..1a350a116a 100644
--- a/tests/cluecode/data/ics/libxml2/triostr.c.yml
+++ b/tests/cluecode/data/ics/libxml2/triostr.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Bjorn Reese and Daniel Stenberg
     count: 1
+allrights:
+  - Copyright (c) 2001 Bjorn Reese and Daniel Stenberg.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/libxslt/Copyright.yml b/tests/cluecode/data/ics/libxslt/Copyright.yml
index 9a4f5f19c6..f99afc915e 100644
--- a/tests/cluecode/data/ics/libxslt/Copyright.yml
+++ b/tests/cluecode/data/ics/libxslt/Copyright.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Thomas Broyer, Charlie Bozeman and Daniel Veillard
     count: 1
+allrights:
+  - Copyright (c) 2001-2002 Daniel Veillard. All Rights Reserved.
+  - Copyright (c) 2001-2002 Thomas Broyer, Charlie Bozeman and Daniel Veillard. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/markdown-markdown-extensions/codehilite.py.yml b/tests/cluecode/data/ics/markdown-markdown-extensions/codehilite.py.yml
index 30d1c717a1..2843d75b10 100644
--- a/tests/cluecode/data/ics/markdown-markdown-extensions/codehilite.py.yml
+++ b/tests/cluecode/data/ics/markdown-markdown-extensions/codehilite.py.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Waylan Limberg
     count: 1
+allrights:
+  - Copyright 2006-2008 Waylan Limberg (http://achinghead.com/).
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/markdown-markdown/html4.py.yml b/tests/cluecode/data/ics/markdown-markdown/html4.py.yml
index 38a3da7e19..f44014f475 100644
--- a/tests/cluecode/data/ics/markdown-markdown/html4.py.yml
+++ b/tests/cluecode/data/ics/markdown-markdown/html4.py.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Fredrik Lundh
     count: 2
+allrights:
+  - Copyright (c) 1999-2007 by Fredrik Lundh. All rights reserved.
+  - Copyright (c) 1999-2007 by Fredrik Lundh
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/mesa3d-docs/license.html.yml b/tests/cluecode/data/ics/mesa3d-docs/license.html.yml
index 9ec29284d6..d0483f147b 100644
--- a/tests/cluecode/data/ics/mesa3d-docs/license.html.yml
+++ b/tests/cluecode/data/ics/mesa3d-docs/license.html.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: SGI
     count: 1
+allrights:
+  - copyrighted by Mark Kilgard
+  - copyrighted by SGI
+  - Copyright (c) 1999-2007 Brian Paul All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/mesa3d-docs/subset-A.html.yml b/tests/cluecode/data/ics/mesa3d-docs/subset-A.html.yml
index b3826e8dd8..e644e88c03 100644
--- a/tests/cluecode/data/ics/mesa3d-docs/subset-A.html.yml
+++ b/tests/cluecode/data/ics/mesa3d-docs/subset-A.html.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Tungsten Graphics, Inc., Cedar Park, Texas
     count: 1
+allrights:
+  - Copyright (c) 2002-2003 by Tungsten Graphics, Inc., Cedar Park, Texas. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/mesa3d-include-c99/stdbool.h.yml b/tests/cluecode/data/ics/mesa3d-include-c99/stdbool.h.yml
index 3d0ad06bcf..f0f29d464f 100644
--- a/tests/cluecode/data/ics/mesa3d-include-c99/stdbool.h.yml
+++ b/tests/cluecode/data/ics/mesa3d-include-c99/stdbool.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: VMware, Inc.
     count: 1
+allrights:
+  - Copyright 2007-2010 VMware, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/mesa3d-src-glsl-glcpp/Makefile.am.yml b/tests/cluecode/data/ics/mesa3d-src-glsl-glcpp/Makefile.am.yml
index fee6c5d700..6818a8527b 100644
--- a/tests/cluecode/data/ics/mesa3d-src-glsl-glcpp/Makefile.am.yml
+++ b/tests/cluecode/data/ics/mesa3d-src-glsl-glcpp/Makefile.am.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Intel Corporation
     count: 1
+allrights:
+  - Copyright (c) 2010 Intel Corporation All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/mesa3d-src-glsl/ir_to_llvm.cpp.yml b/tests/cluecode/data/ics/mesa3d-src-glsl/ir_to_llvm.cpp.yml
index de8c8d1fd6..8533c77257 100644
--- a/tests/cluecode/data/ics/mesa3d-src-glsl/ir_to_llvm.cpp.yml
+++ b/tests/cluecode/data/ics/mesa3d-src-glsl/ir_to_llvm.cpp.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: VMware, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2005-2007 Brian Paul All Rights Reserved.
+  - Copyright (c) 2008 VMware, Inc. All Rights Reserved.
+  - Copyright (c) 2010 Intel Corporation
+  - Copyright (c) 2010 Luca Barbieri
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/mesa3d-src-glsl/program.h.yml b/tests/cluecode/data/ics/mesa3d-src-glsl/program.h.yml
index f01722a91f..9883994f8f 100644
--- a/tests/cluecode/data/ics/mesa3d-src-glsl/program.h.yml
+++ b/tests/cluecode/data/ics/mesa3d-src-glsl/program.h.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: VMware, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1999-2008 Brian Paul All Rights Reserved.
+  - Copyright (c) 2009 VMware, Inc. All Rights Reserved.
+  - Copyright (c) 2010 Intel Corporation
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/mesa3d-src-glsl/strtod.c.yml b/tests/cluecode/data/ics/mesa3d-src-glsl/strtod.c.yml
index c0f07452d8..efa7ca7a5f 100644
--- a/tests/cluecode/data/ics/mesa3d-src-glsl/strtod.c.yml
+++ b/tests/cluecode/data/ics/mesa3d-src-glsl/strtod.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: VMware, Inc.
     count: 1
+allrights:
+  - Copyright 2010 VMware, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/mesa3d-src-mesa-main/compiler.h.yml b/tests/cluecode/data/ics/mesa3d-src-mesa-main/compiler.h.yml
index dd11bb04f7..cdad195653 100644
--- a/tests/cluecode/data/ics/mesa3d-src-mesa-main/compiler.h.yml
+++ b/tests/cluecode/data/ics/mesa3d-src-mesa-main/compiler.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: VMware, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1999-2008 Brian Paul All Rights Reserved.
+  - Copyright (c) 2009 VMware, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/mesa3d-src-mesa-main/config.h.yml b/tests/cluecode/data/ics/mesa3d-src-mesa-main/config.h.yml
index b4820236e1..f76cf56b0d 100644
--- a/tests/cluecode/data/ics/mesa3d-src-mesa-main/config.h.yml
+++ b/tests/cluecode/data/ics/mesa3d-src-mesa-main/config.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: VMware, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1999-2007 Brian Paul All Rights Reserved.
+  - Copyright (c) 2008 VMware, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/mesa3d-src-mesa-main/debug.h.yml b/tests/cluecode/data/ics/mesa3d-src-mesa-main/debug.h.yml
index a1bd99dcda..fee87c4d85 100644
--- a/tests/cluecode/data/ics/mesa3d-src-mesa-main/debug.h.yml
+++ b/tests/cluecode/data/ics/mesa3d-src-mesa-main/debug.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Brian Paul
     count: 1
+allrights:
+  - Copyright (c) 1999-2004 Brian Paul All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/mesa3d-src-mesa-main/get.h.yml b/tests/cluecode/data/ics/mesa3d-src-mesa-main/get.h.yml
index 1e2d50f29f..7719fa1d93 100644
--- a/tests/cluecode/data/ics/mesa3d-src-mesa-main/get.h.yml
+++ b/tests/cluecode/data/ics/mesa3d-src-mesa-main/get.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Brian Paul
     count: 1
+allrights:
+  - Copyright (c) 1999-2001 Brian Paul All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/mesa3d-src-mesa-main/glheader.h.yml b/tests/cluecode/data/ics/mesa3d-src-mesa-main/glheader.h.yml
index 5b5545baa2..550456c480 100644
--- a/tests/cluecode/data/ics/mesa3d-src-mesa-main/glheader.h.yml
+++ b/tests/cluecode/data/ics/mesa3d-src-mesa-main/glheader.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Brian Paul
     count: 1
+allrights:
+  - Copyright (c) 1999-2008 Brian Paul All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/mesa3d-src-mesa-main/hash.h.yml b/tests/cluecode/data/ics/mesa3d-src-mesa-main/hash.h.yml
index 66775aaea1..33d38eb0e4 100644
--- a/tests/cluecode/data/ics/mesa3d-src-mesa-main/hash.h.yml
+++ b/tests/cluecode/data/ics/mesa3d-src-mesa-main/hash.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Brian Paul
     count: 1
+allrights:
+  - Copyright (c) 1999-2006 Brian Paul All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/mesa3d-src-mesa-main/shaderobj.h.yml b/tests/cluecode/data/ics/mesa3d-src-mesa-main/shaderobj.h.yml
index 8520155d60..118def1250 100644
--- a/tests/cluecode/data/ics/mesa3d-src-mesa-main/shaderobj.h.yml
+++ b/tests/cluecode/data/ics/mesa3d-src-mesa-main/shaderobj.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Brian Paul
     count: 1
+allrights:
+  - Copyright (c) 2004-2007 Brian Paul All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/mesa3d-src-mesa-main/simple_list.h.yml b/tests/cluecode/data/ics/mesa3d-src-mesa-main/simple_list.h.yml
index ac98742c80..2460c44efd 100644
--- a/tests/cluecode/data/ics/mesa3d-src-mesa-main/simple_list.h.yml
+++ b/tests/cluecode/data/ics/mesa3d-src-mesa-main/simple_list.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Keith Whitwell
     count: 1
+allrights:
+  - (c) 1997, Keith Whitwell
+  - Copyright (c) 1999-2001 Brian Paul All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/mesa3d-src-mesa-program/prog_statevars.h.yml b/tests/cluecode/data/ics/mesa3d-src-mesa-program/prog_statevars.h.yml
index 0f511e79cf..94e05dc5ee 100644
--- a/tests/cluecode/data/ics/mesa3d-src-mesa-program/prog_statevars.h.yml
+++ b/tests/cluecode/data/ics/mesa3d-src-mesa-program/prog_statevars.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Brian Paul
     count: 1
+allrights:
+  - Copyright (c) 1999-2007 Brian Paul All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/mesa3d-test/m_matrix.c.yml b/tests/cluecode/data/ics/mesa3d-test/m_matrix.c.yml
index 142c34ec3c..a53d27757c 100644
--- a/tests/cluecode/data/ics/mesa3d-test/m_matrix.c.yml
+++ b/tests/cluecode/data/ics/mesa3d-test/m_matrix.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Brian Paul
     count: 1
+allrights:
+  - Copyright (c) 1999-2005 Brian Paul All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/mesa3d-test/m_matrix.h.yml b/tests/cluecode/data/ics/mesa3d-test/m_matrix.h.yml
index 142c34ec3c..a53d27757c 100644
--- a/tests/cluecode/data/ics/mesa3d-test/m_matrix.h.yml
+++ b/tests/cluecode/data/ics/mesa3d-test/m_matrix.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Brian Paul
     count: 1
+allrights:
+  - Copyright (c) 1999-2005 Brian Paul All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/mesa3d/NOTICE.yml b/tests/cluecode/data/ics/mesa3d/NOTICE.yml
index 7be1eb01e6..3484ef1865 100644
--- a/tests/cluecode/data/ics/mesa3d/NOTICE.yml
+++ b/tests/cluecode/data/ics/mesa3d/NOTICE.yml
@@ -29,3 +29,10 @@ holders_summary:
     count: 1
   - value: VMware, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1999-2008 Brian Paul All Rights Reserved.
+  - Copyright (c) 2008-1010 Intel Corporation
+  - Copyright (c) 2007-2010 VMware, Inc. All Rights Reserved.
+  - Copyright (c) 2010 Luca Barbieri
+  - Copyright (c) 2006 Alexander Chemeris
+  - Copyright 2007,2010,2011 The Android Open Source Project
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/netperf/MODULE_LICENSE_HP.yml b/tests/cluecode/data/ics/netperf/MODULE_LICENSE_HP.yml
index b2de87d548..8b0fa43934 100644
--- a/tests/cluecode/data/ics/netperf/MODULE_LICENSE_HP.yml
+++ b/tests/cluecode/data/ics/netperf/MODULE_LICENSE_HP.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Hewlett-Packard
     count: 2
+allrights:
+  - Copyright (c) 1993 Hewlett-Packard Company ALL RIGHTS RESERVED.
+  - copyrighted works of Hewlett-Packard Co.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/netperf/netcpu_looper.c.yml b/tests/cluecode/data/ics/netperf/netcpu_looper.c.yml
index ee7dac0592..6d3af9bf3a 100644
--- a/tests/cluecode/data/ics/netperf/netcpu_looper.c.yml
+++ b/tests/cluecode/data/ics/netperf/netcpu_looper.c.yml
@@ -4,3 +4,5 @@ what:
   - holders_summary
 copyrights:
   - (c) Copyright 2005-2007
+allrights:
+  - (c) Copyright 2005-2007.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/netperf/netlib.c.yml b/tests/cluecode/data/ics/netperf/netlib.c.yml
index f4bf5557e3..c740f4404b 100644
--- a/tests/cluecode/data/ics/netperf/netlib.c.yml
+++ b/tests/cluecode/data/ics/netperf/netlib.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Hewlett-Packard
     count: 1
+allrights:
+  - (c) Copyright 1993-2007 Hewlett-Packard Company.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/netperf/netperf.c.yml b/tests/cluecode/data/ics/netperf/netperf.c.yml
index 0551c233e6..ba592cea2e 100644
--- a/tests/cluecode/data/ics/netperf/netperf.c.yml
+++ b/tests/cluecode/data/ics/netperf/netperf.c.yml
@@ -13,3 +13,7 @@ holders:
 holders_summary:
   - value: Hewlett-Packard
     count: 3
+allrights:
+  - Copyright (c) 1993-2007 Hewlett-Packard Company ALL RIGHTS RESERVED.
+  - copyrighted works of Hewlett-Packard Co.
+  - (c) Copyright 1993-2007 Hewlett-Packard Company.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/netperf/netserver.c.yml b/tests/cluecode/data/ics/netperf/netserver.c.yml
index bdffcce194..7cca5de1bf 100644
--- a/tests/cluecode/data/ics/netperf/netserver.c.yml
+++ b/tests/cluecode/data/ics/netperf/netserver.c.yml
@@ -14,3 +14,7 @@ holders_summary:
   - value: Hewlett-Packard
     count: 3
 notes: may fail on Co. vs Company.
+allrights:
+  - Copyright (c) 1993-2007 Hewlett-Packard Company ALL RIGHTS RESERVED.
+  - copyrighted works of Hewlett-Packard Co.
+  - (c) Copyright 1993-2007 Hewlett-Packard Co.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/opencv-cv-include/cv.h.yml b/tests/cluecode/data/ics/opencv-cv-include/cv.h.yml
index 308532fd25..6424ba4453 100644
--- a/tests/cluecode/data/ics/opencv-cv-include/cv.h.yml
+++ b/tests/cluecode/data/ics/opencv-cv-include/cv.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Intel Corporation
     count: 1
+allrights:
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/opencv-cv-src/_cvkdtree.hpp.yml b/tests/cluecode/data/ics/opencv-cv-src/_cvkdtree.hpp.yml
index 7522f70c8c..6aaf321555 100644
--- a/tests/cluecode/data/ics/opencv-cv-src/_cvkdtree.hpp.yml
+++ b/tests/cluecode/data/ics/opencv-cv-src/_cvkdtree.hpp.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Xavier Delacour
     count: 1
+allrights:
+  - Copyright (c) 2008, Xavier Delacour, all rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/opencv-cv-src/cvcolor.cpp.yml b/tests/cluecode/data/ics/opencv-cv-src/cvcolor.cpp.yml
index 4810e16bbe..1d435a4d24 100644
--- a/tests/cluecode/data/ics/opencv-cv-src/cvcolor.cpp.yml
+++ b/tests/cluecode/data/ics/opencv-cv-src/cvcolor.cpp.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: MD-Mathematische Dienste GmbH Im Defdahl
     count: 1
+allrights:
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
+  - Copyright (c) 2002, MD-Mathematische Dienste GmbH Im Defdahl
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/opencv-cv-src/cvdistransform.cpp.yml b/tests/cluecode/data/ics/opencv-cv-src/cvdistransform.cpp.yml
index 053bed77d1..13cfbb32bb 100644
--- a/tests/cluecode/data/ics/opencv-cv-src/cvdistransform.cpp.yml
+++ b/tests/cluecode/data/ics/opencv-cv-src/cvdistransform.cpp.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Jay Stavinzky
     count: 1
+allrights:
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
+  - (c) 2006 by Jay Stavinzky.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/opencv-cv-src/cvemd.cpp.yml b/tests/cluecode/data/ics/opencv-cv-src/cvemd.cpp.yml
index 366dbaa1ad..71b6809c39 100644
--- a/tests/cluecode/data/ics/opencv-cv-src/cvemd.cpp.yml
+++ b/tests/cluecode/data/ics/opencv-cv-src/cvemd.cpp.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Yossi Rubner Computer Science Department, Stanford University
     count: 1
+allrights:
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
+  - Copyright (c) 1998 Yossi Rubner Computer Science Department, Stanford University
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/opencv-cv-src/cvkdtree.cpp.yml b/tests/cluecode/data/ics/opencv-cv-src/cvkdtree.cpp.yml
index 7522f70c8c..6aaf321555 100644
--- a/tests/cluecode/data/ics/opencv-cv-src/cvkdtree.cpp.yml
+++ b/tests/cluecode/data/ics/opencv-cv-src/cvkdtree.cpp.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Xavier Delacour
     count: 1
+allrights:
+  - Copyright (c) 2008, Xavier Delacour, all rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/opencv-cv-src/cvsmooth.cpp.yml b/tests/cluecode/data/ics/opencv-cv-src/cvsmooth.cpp.yml
index ba0de30c1a..251a8a9f47 100644
--- a/tests/cluecode/data/ics/opencv-cv-src/cvsmooth.cpp.yml
+++ b/tests/cluecode/data/ics/opencv-cv-src/cvsmooth.cpp.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Simon Perreault
     count: 1
+allrights:
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
+  - Copyright (c) 2006 Simon Perreault
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/opencv-cv-src/cvsurf.cpp.yml b/tests/cluecode/data/ics/opencv-cv-src/cvsurf.cpp.yml
index e792d8a705..193d3280cf 100644
--- a/tests/cluecode/data/ics/opencv-cv-src/cvsurf.cpp.yml
+++ b/tests/cluecode/data/ics/opencv-cv-src/cvsurf.cpp.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Liu Liu
     count: 1
+allrights:
+  - Copyright (c) 2008, Liu Liu All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/opencv-cvaux-src/cv3dtracker.cpp.yml b/tests/cluecode/data/ics/opencv-cvaux-src/cv3dtracker.cpp.yml
index 57f32fe77b..61ad32f27c 100644
--- a/tests/cluecode/data/ics/opencv-cvaux-src/cv3dtracker.cpp.yml
+++ b/tests/cluecode/data/ics/opencv-cvaux-src/cv3dtracker.cpp.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Intel Corporation
     count: 1
+allrights:
+  - Copyright (c) 2002, Intel Corporation, all rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/opencv-cvaux-src/cvdpstereo.cpp.yml b/tests/cluecode/data/ics/opencv-cvaux-src/cvdpstereo.cpp.yml
index 308532fd25..6424ba4453 100644
--- a/tests/cluecode/data/ics/opencv-cvaux-src/cvdpstereo.cpp.yml
+++ b/tests/cluecode/data/ics/opencv-cvaux-src/cvdpstereo.cpp.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Intel Corporation
     count: 1
+allrights:
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/opencv-cxcore-include/cvwimage.h.yml b/tests/cluecode/data/ics/opencv-cxcore-include/cvwimage.h.yml
index 836a04a8c9..4160fed58a 100644
--- a/tests/cluecode/data/ics/opencv-cxcore-include/cvwimage.h.yml
+++ b/tests/cluecode/data/ics/opencv-cxcore-include/cvwimage.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright (c) 2008, Google, all rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/opencv-cxcore-include/cxmisc.h.yml b/tests/cluecode/data/ics/opencv-cxcore-include/cxmisc.h.yml
index ce66c8402b..a7ed7c110c 100644
--- a/tests/cluecode/data/ics/opencv-cxcore-include/cxmisc.h.yml
+++ b/tests/cluecode/data/ics/opencv-cxcore-include/cxmisc.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
+  - Copyright (c) 1992, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/opencv-cxcore-include/cxtypes.h.yml b/tests/cluecode/data/ics/opencv-cxcore-include/cxtypes.h.yml
index d6bcdc7fcb..e7e4dc8410 100644
--- a/tests/cluecode/data/ics/opencv-cxcore-include/cxtypes.h.yml
+++ b/tests/cluecode/data/ics/opencv-cxcore-include/cxtypes.h.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Intel Corporation
     count: 2
+allrights:
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
+  - Copyright (c) 1995 Intel Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/opencv-cxcore-src/cxdatastructs.cpp.yml b/tests/cluecode/data/ics/opencv-cxcore-src/cxdatastructs.cpp.yml
index ce66c8402b..a7ed7c110c 100644
--- a/tests/cluecode/data/ics/opencv-cxcore-src/cxdatastructs.cpp.yml
+++ b/tests/cluecode/data/ics/opencv-cxcore-src/cxdatastructs.cpp.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
+  - Copyright (c) 1992, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/opencv-cxcore-src/cxutils.cpp.yml b/tests/cluecode/data/ics/opencv-cxcore-src/cxutils.cpp.yml
index e73e36c6e4..b5b0776a5a 100644
--- a/tests/cluecode/data/ics/opencv-cxcore-src/cxutils.cpp.yml
+++ b/tests/cluecode/data/ics/opencv-cxcore-src/cxutils.cpp.yml
@@ -15,3 +15,7 @@ holders_summary:
     count: 2
   - value: Intel Corporation
     count: 1
+allrights:
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
+  - Copyright (c) 1978-1999 Ken Turkowski. <turk@computer.org>
+  - Copyright (c) 1981-1999 Ken Turkowski. <turk@computer.org>
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/opencv-ml-src/mlsvm.cpp.yml b/tests/cluecode/data/ics/opencv-ml-src/mlsvm.cpp.yml
index 4797ac9098..d4890a2bfb 100644
--- a/tests/cluecode/data/ics/opencv-ml-src/mlsvm.cpp.yml
+++ b/tests/cluecode/data/ics/opencv-ml-src/mlsvm.cpp.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Intel Corporation
     count: 1
+allrights:
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
+  - Copyright (c) 2000-2003 Chih-Chung Chang and Chih-Jen Lin All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/opencv-otherlibs-highgui/cvcap_socket.cpp.yml b/tests/cluecode/data/ics/opencv-otherlibs-highgui/cvcap_socket.cpp.yml
index 01bc85b6c7..e03a2187e0 100644
--- a/tests/cluecode/data/ics/opencv-otherlibs-highgui/cvcap_socket.cpp.yml
+++ b/tests/cluecode/data/ics/opencv-otherlibs-highgui/cvcap_socket.cpp.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Nils Hasler
     count: 1
+allrights:
+  - Copyright (c) 2008, Nils Hasler, all rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/opencv-otherlibs-highgui/grfmt_png.cpp.yml b/tests/cluecode/data/ics/opencv-otherlibs-highgui/grfmt_png.cpp.yml
index 9ef5cf5289..01379c5052 100644
--- a/tests/cluecode/data/ics/opencv-otherlibs-highgui/grfmt_png.cpp.yml
+++ b/tests/cluecode/data/ics/opencv-otherlibs-highgui/grfmt_png.cpp.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: MIYASAKA Masaru
     count: 1
+allrights:
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
+  - (Copyright (c) 1999-2001 MIYASAKA Masaru)
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/opencv/LICENSE_OpenCV.yml b/tests/cluecode/data/ics/opencv/LICENSE_OpenCV.yml
index da7235a00b..c21ca575d1 100644
--- a/tests/cluecode/data/ics/opencv/LICENSE_OpenCV.yml
+++ b/tests/cluecode/data/ics/opencv/LICENSE_OpenCV.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Intel Corporation
     count: 1
+allrights:
+  - Copyright (c) 2000-2006, Intel Corporation, all rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/opencv/NOTICE.yml b/tests/cluecode/data/ics/opencv/NOTICE.yml
index 3e707dbc3f..c12d3c8c05 100644
--- a/tests/cluecode/data/ics/opencv/NOTICE.yml
+++ b/tests/cluecode/data/ics/opencv/NOTICE.yml
@@ -79,3 +79,29 @@ holders_summary:
     count: 1
   - value: Yossi Rubner Computer Science Department, Stanford University
     count: 1
+allrights:
+  - Copyright (c) 2000-2006, Intel Corporation, all rights reserved.
+  - Copyright (c) 2006-2009 SIProp Project http://www.siprop.org
+  - Copyright (c) 1992, 1993 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 2008, Liu Liu All rights reserved.
+  - Copyright (c) 2008, Google, all rights reserved.
+  - Copyright (c) 1992, 1993 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 2002, MD-Mathematische Dienste GmbH Im Defdahl
+  - Copyright (c) 2000-2003 Chih-Chung Chang and Chih-Jen Lin All rights reserved.
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
+  - Copyright (c) 2002, Intel Corp, all rights reserved.
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
+  - Copyright (c) 2008, Xavier Delacour, all rights reserved.
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
+  - Copyright (c) 2008, Nils Hasler, all rights reserved.
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
+  - Copyright (c) 2000, Intel Corporation, all rights reserved.
+  - Copyright (c) 1978-1999 Ken Turkowski. <turk@computer.org>
+  - Copyright (c) 1981-1999 Ken Turkowski. <turk@computer.org>
+  - Copyright (c) 1998 Yossi Rubner Computer Science Department, Stanford University
+  - Copyright (c) 2006 Simon Perreault
+  - Copyright (c) 1995 Intel Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-apps/app_rand.c.yml b/tests/cluecode/data/ics/openssl-apps/app_rand.c.yml
index fc3d840221..989ae26636 100644
--- a/tests/cluecode/data/ics/openssl-apps/app_rand.c.yml
+++ b/tests/cluecode/data/ics/openssl-apps/app_rand.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-apps/apps.c.yml b/tests/cluecode/data/ics/openssl-apps/apps.c.yml
index 8277dd8ef5..5347bcdc4e 100644
--- a/tests/cluecode/data/ics/openssl-apps/apps.c.yml
+++ b/tests/cluecode/data/ics/openssl-apps/apps.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-apps/apps.h.yml b/tests/cluecode/data/ics/openssl-apps/apps.h.yml
index 8277dd8ef5..5347bcdc4e 100644
--- a/tests/cluecode/data/ics/openssl-apps/apps.h.yml
+++ b/tests/cluecode/data/ics/openssl-apps/apps.h.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-apps/asn1pars.c.yml b/tests/cluecode/data/ics/openssl-apps/asn1pars.c.yml
index b7f805459f..b0bd7e9c57 100644
--- a/tests/cluecode/data/ics/openssl-apps/asn1pars.c.yml
+++ b/tests/cluecode/data/ics/openssl-apps/asn1pars.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-apps/cms.c.yml b/tests/cluecode/data/ics/openssl-apps/cms.c.yml
index e014cf805a..f058602cc1 100644
--- a/tests/cluecode/data/ics/openssl-apps/cms.c.yml
+++ b/tests/cluecode/data/ics/openssl-apps/cms.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2008 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-apps/ec.c.yml b/tests/cluecode/data/ics/openssl-apps/ec.c.yml
index 8008248c9e..020bc0d133 100644
--- a/tests/cluecode/data/ics/openssl-apps/ec.c.yml
+++ b/tests/cluecode/data/ics/openssl-apps/ec.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-apps/ecparam.c.yml b/tests/cluecode/data/ics/openssl-apps/ecparam.c.yml
index d827adeeb4..53981e8f36 100644
--- a/tests/cluecode/data/ics/openssl-apps/ecparam.c.yml
+++ b/tests/cluecode/data/ics/openssl-apps/ecparam.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved.
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-apps/engine.c.yml b/tests/cluecode/data/ics/openssl-apps/engine.c.yml
index 005fa378c4..98e73753d2 100644
--- a/tests/cluecode/data/ics/openssl-apps/engine.c.yml
+++ b/tests/cluecode/data/ics/openssl-apps/engine.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2000 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-apps/genpkey.c.yml b/tests/cluecode/data/ics/openssl-apps/genpkey.c.yml
index b3dccc2397..428bb32e69 100644
--- a/tests/cluecode/data/ics/openssl-apps/genpkey.c.yml
+++ b/tests/cluecode/data/ics/openssl-apps/genpkey.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2006 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-apps/nseq.c.yml b/tests/cluecode/data/ics/openssl-apps/nseq.c.yml
index f57d0f96a0..462a310a23 100644
--- a/tests/cluecode/data/ics/openssl-apps/nseq.c.yml
+++ b/tests/cluecode/data/ics/openssl-apps/nseq.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1999 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-apps/openssl.c.yml b/tests/cluecode/data/ics/openssl-apps/openssl.c.yml
index f27a55db93..1f9579f247 100644
--- a/tests/cluecode/data/ics/openssl-apps/openssl.c.yml
+++ b/tests/cluecode/data/ics/openssl-apps/openssl.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-apps/pkcs12.c.yml b/tests/cluecode/data/ics/openssl-apps/pkcs12.c.yml
index 4ccf0f1454..ed7b252d6c 100644
--- a/tests/cluecode/data/ics/openssl-apps/pkcs12.c.yml
+++ b/tests/cluecode/data/ics/openssl-apps/pkcs12.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-apps/prime.c.yml b/tests/cluecode/data/ics/openssl-apps/prime.c.yml
index 32a953545b..c5196b305b 100644
--- a/tests/cluecode/data/ics/openssl-apps/prime.c.yml
+++ b/tests/cluecode/data/ics/openssl-apps/prime.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2004 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-apps/rand.c.yml b/tests/cluecode/data/ics/openssl-apps/rand.c.yml
index 69fa9a62c6..46f589218d 100644
--- a/tests/cluecode/data/ics/openssl-apps/rand.c.yml
+++ b/tests/cluecode/data/ics/openssl-apps/rand.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-apps/s_client.c.yml b/tests/cluecode/data/ics/openssl-apps/s_client.c.yml
index 8677231fa5..bcbb04a750 100644
--- a/tests/cluecode/data/ics/openssl-apps/s_client.c.yml
+++ b/tests/cluecode/data/ics/openssl-apps/s_client.c.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
+  - Copyright 2005 Nokia. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-apps/s_server.c.yml b/tests/cluecode/data/ics/openssl-apps/s_server.c.yml
index cf21443ad3..d8e80e252d 100644
--- a/tests/cluecode/data/ics/openssl-apps/s_server.c.yml
+++ b/tests/cluecode/data/ics/openssl-apps/s_server.c.yml
@@ -25,3 +25,9 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+  - Copyright 2005 Nokia. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-apps/smime.c.yml b/tests/cluecode/data/ics/openssl-apps/smime.c.yml
index f5f7889257..60419c9e6b 100644
--- a/tests/cluecode/data/ics/openssl-apps/smime.c.yml
+++ b/tests/cluecode/data/ics/openssl-apps/smime.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1999-2004 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-apps/speed.c.yml b/tests/cluecode/data/ics/openssl-apps/speed.c.yml
index eab14eec4a..9810e0e5d0 100644
--- a/tests/cluecode/data/ics/openssl-apps/speed.c.yml
+++ b/tests/cluecode/data/ics/openssl-apps/speed.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-apps/timeouts.h.yml b/tests/cluecode/data/ics/openssl-apps/timeouts.h.yml
index 90048d6305..1b2cbe1280 100644
--- a/tests/cluecode/data/ics/openssl-apps/timeouts.h.yml
+++ b/tests/cluecode/data/ics/openssl-apps/timeouts.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-aes/aes.h.yml b/tests/cluecode/data/ics/openssl-crypto-aes/aes.h.yml
index 76c010cca7..636fe9daba 100644
--- a/tests/cluecode/data/ics/openssl-crypto-aes/aes.h.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-aes/aes.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-aes/aes_cfb.c.yml b/tests/cluecode/data/ics/openssl-crypto-aes/aes_cfb.c.yml
index f1faf9fc2d..299bc556af 100644
--- a/tests/cluecode/data/ics/openssl-crypto-aes/aes_cfb.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-aes/aes_cfb.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2002-2006 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-asn1/a_sign.c.yml b/tests/cluecode/data/ics/openssl-crypto-asn1/a_sign.c.yml
index 188c3fda56..d363d557ab 100644
--- a/tests/cluecode/data/ics/openssl-crypto-asn1/a_sign.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-asn1/a_sign.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2003 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-asn1/asn1_err.c.yml b/tests/cluecode/data/ics/openssl-crypto-asn1/asn1_err.c.yml
index d035deec7d..a05181276b 100644
--- a/tests/cluecode/data/ics/openssl-crypto-asn1/asn1_err.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-asn1/asn1_err.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1999-2009 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-asn1/asn1_gen.c.yml b/tests/cluecode/data/ics/openssl-crypto-asn1/asn1_gen.c.yml
index 859a0d0e1e..4879dae234 100644
--- a/tests/cluecode/data/ics/openssl-crypto-asn1/asn1_gen.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-asn1/asn1_gen.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2002 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-asn1/asn1t.h.yml b/tests/cluecode/data/ics/openssl-crypto-asn1/asn1t.h.yml
index 49fddf031f..d6691347bb 100644
--- a/tests/cluecode/data/ics/openssl-crypto-asn1/asn1t.h.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-asn1/asn1t.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2000-2005 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-asn1/asn_mime.c.yml b/tests/cluecode/data/ics/openssl-crypto-asn1/asn_mime.c.yml
index 2f991bebf3..a5fdb6ad10 100644
--- a/tests/cluecode/data/ics/openssl-crypto-asn1/asn_mime.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-asn1/asn_mime.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1999-2008 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-asn1/asn_moid.c.yml b/tests/cluecode/data/ics/openssl-crypto-asn1/asn_moid.c.yml
index f467245104..9b4b4b9a54 100644
--- a/tests/cluecode/data/ics/openssl-crypto-asn1/asn_moid.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-asn1/asn_moid.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2001-2004 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-asn1/tasn_dec.c.yml b/tests/cluecode/data/ics/openssl-crypto-asn1/tasn_dec.c.yml
index 49fddf031f..d6691347bb 100644
--- a/tests/cluecode/data/ics/openssl-crypto-asn1/tasn_dec.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-asn1/tasn_dec.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2000-2005 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-asn1/tasn_enc.c.yml b/tests/cluecode/data/ics/openssl-crypto-asn1/tasn_enc.c.yml
index e289f1a542..04e3c93382 100644
--- a/tests/cluecode/data/ics/openssl-crypto-asn1/tasn_enc.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-asn1/tasn_enc.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2000-2004 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-asn1/tasn_prn.c.yml b/tests/cluecode/data/ics/openssl-crypto-asn1/tasn_prn.c.yml
index 2bf4b24148..5d7140c0e1 100644
--- a/tests/cluecode/data/ics/openssl-crypto-asn1/tasn_prn.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-asn1/tasn_prn.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2000,2005 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-asn1/x_nx509.c.yml b/tests/cluecode/data/ics/openssl-crypto-asn1/x_nx509.c.yml
index 23e7279084..081f0d82e7 100644
--- a/tests/cluecode/data/ics/openssl-crypto-asn1/x_nx509.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-asn1/x_nx509.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2005 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-bf/COPYRIGHT.yml b/tests/cluecode/data/ics/openssl-crypto-bf/COPYRIGHT.yml
index c82d30134f..7a8f5eaa9d 100644
--- a/tests/cluecode/data/ics/openssl-crypto-bf/COPYRIGHT.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-bf/COPYRIGHT.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Eric Young
     count: 1
+allrights:
+  - Copyright (c) 1995-1997 Eric Young (eay@cryptsoft.com) All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-bf/bf_locl.h.yml b/tests/cluecode/data/ics/openssl-crypto-bf/bf_locl.h.yml
index c04caad3d8..02eb600796 100644
--- a/tests/cluecode/data/ics/openssl-crypto-bf/bf_locl.h.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-bf/bf_locl.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1997 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-bio/b_print.c.yml b/tests/cluecode/data/ics/openssl-crypto-bio/b_print.c.yml
index c22ce8f9f2..09d96b0c0d 100644
--- a/tests/cluecode/data/ics/openssl-crypto-bio/b_print.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-bio/b_print.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright Patrick Powell 1995
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-bio/bss_bio.c.yml b/tests/cluecode/data/ics/openssl-crypto-bio/bss_bio.c.yml
index a4f108dd79..b30b8acdf4 100644
--- a/tests/cluecode/data/ics/openssl-crypto-bio/bss_bio.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-bio/bss_bio.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1998-2003 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-bn/bn.h.yml b/tests/cluecode/data/ics/openssl-crypto-bn/bn.h.yml
index 2c5ad60676..e2a3f9affd 100644
--- a/tests/cluecode/data/ics/openssl-crypto-bn/bn.h.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-bn/bn.h.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1997 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-bn/bn_blind.c.yml b/tests/cluecode/data/ics/openssl-crypto-bn/bn_blind.c.yml
index 97e5168f6d..974fefd2f9 100644
--- a/tests/cluecode/data/ics/openssl-crypto-bn/bn_blind.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-bn/bn_blind.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-bn/bn_ctx.c.yml b/tests/cluecode/data/ics/openssl-crypto-bn/bn_ctx.c.yml
index d16286233c..b0d51c0319 100644
--- a/tests/cluecode/data/ics/openssl-crypto-bn/bn_ctx.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-bn/bn_ctx.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1998-2004 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-bn/bn_err.c.yml b/tests/cluecode/data/ics/openssl-crypto-bn/bn_err.c.yml
index 556bfabf9e..bfc006983c 100644
--- a/tests/cluecode/data/ics/openssl-crypto-bn/bn_err.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-bn/bn_err.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-bn/bn_exp.c.yml b/tests/cluecode/data/ics/openssl-crypto-bn/bn_exp.c.yml
index f92e170af7..36ad42e90e 100644
--- a/tests/cluecode/data/ics/openssl-crypto-bn/bn_exp.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-bn/bn_exp.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-bn/bn_gf2m.c.yml b/tests/cluecode/data/ics/openssl-crypto-bn/bn_gf2m.c.yml
index 8671162718..7bb57391ca 100644
--- a/tests/cluecode/data/ics/openssl-crypto-bn/bn_gf2m.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-bn/bn_gf2m.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+  - Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-bn/bn_lcl.h.yml b/tests/cluecode/data/ics/openssl-crypto-bn/bn_lcl.h.yml
index fc3d840221..989ae26636 100644
--- a/tests/cluecode/data/ics/openssl-crypto-bn/bn_lcl.h.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-bn/bn_lcl.h.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-bn/bn_mod.c.yml b/tests/cluecode/data/ics/openssl-crypto-bn/bn_mod.c.yml
index 57e5e9e65f..66d81791f1 100644
--- a/tests/cluecode/data/ics/openssl-crypto-bn/bn_mod.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-bn/bn_mod.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved.
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-des-asm/des_enc.m4.yml b/tests/cluecode/data/ics/openssl-crypto-des-asm/des_enc.m4.yml
index e35a2fe1bb..aa9d8e35f3 100644
--- a/tests/cluecode/data/ics/openssl-crypto-des-asm/des_enc.m4.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-des-asm/des_enc.m4.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Svend Olaf Mikkelsen
     count: 1
+allrights:
+  - Copyright Svend Olaf Mikkelsen.
+  - Copyright Eric A. Young.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-des/README.yml b/tests/cluecode/data/ics/openssl-crypto-des/README.yml
index 69ed77ec5d..0be43b0f11 100644
--- a/tests/cluecode/data/ics/openssl-crypto-des/README.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-des/README.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Eric Young
     count: 1
+allrights:
+  - Copyright (c) 1997, Eric Young All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-des/read2pwd.c.yml b/tests/cluecode/data/ics/openssl-crypto-des/read2pwd.c.yml
index 5cce111831..ef00134bcb 100644
--- a/tests/cluecode/data/ics/openssl-crypto-des/read2pwd.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-des/read2pwd.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 2001-2002 The OpenSSL Project. All rights reserved.
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-des/rpc_des.h.yml b/tests/cluecode/data/ics/openssl-crypto-des/rpc_des.h.yml
index 674f3fb8b8..f4e374aec6 100644
--- a/tests/cluecode/data/ics/openssl-crypto-des/rpc_des.h.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-des/rpc_des.h.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1986 by Sun Microsystems, Inc.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-dsa/dsa_locl.h.yml b/tests/cluecode/data/ics/openssl-crypto-dsa/dsa_locl.h.yml
index 293753f927..8d27576981 100644
--- a/tests/cluecode/data/ics/openssl-crypto-dsa/dsa_locl.h.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-dsa/dsa_locl.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2007 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-ec/ec.h.yml b/tests/cluecode/data/ics/openssl-crypto-ec/ec.h.yml
index d827adeeb4..53981e8f36 100644
--- a/tests/cluecode/data/ics/openssl-crypto-ec/ec.h.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-ec/ec.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved.
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-ec/ec2_mult.c.yml b/tests/cluecode/data/ics/openssl-crypto-ec/ec2_mult.c.yml
index e1a94e568b..c7a676ecb1 100644
--- a/tests/cluecode/data/ics/openssl-crypto-ec/ec2_mult.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-ec/ec2_mult.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+  - Copyright (c) 1998-2003 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-ec/ec2_smpl.c.yml b/tests/cluecode/data/ics/openssl-crypto-ec/ec2_smpl.c.yml
index ac78ab8d91..ec96d1f7ba 100644
--- a/tests/cluecode/data/ics/openssl-crypto-ec/ec2_smpl.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-ec/ec2_smpl.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+  - Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-ec/ec_asn1.c.yml b/tests/cluecode/data/ics/openssl-crypto-ec/ec_asn1.c.yml
index 4a34f67941..493bb2e56f 100644
--- a/tests/cluecode/data/ics/openssl-crypto-ec/ec_asn1.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-ec/ec_asn1.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2000-2003 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-ec/ec_curve.c.yml b/tests/cluecode/data/ics/openssl-crypto-ec/ec_curve.c.yml
index 8701dd58a9..3c41cb388d 100644
--- a/tests/cluecode/data/ics/openssl-crypto-ec/ec_curve.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-ec/ec_curve.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1998-2004 The OpenSSL Project. All rights reserved.
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-ec/ec_mult.c.yml b/tests/cluecode/data/ics/openssl-crypto-ec/ec_mult.c.yml
index 49801dc2ed..2c78d37bf1 100644
--- a/tests/cluecode/data/ics/openssl-crypto-ec/ec_mult.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-ec/ec_mult.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved.
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-ec/ecp_mont.c.yml b/tests/cluecode/data/ics/openssl-crypto-ec/ecp_mont.c.yml
index 1d67ee09c5..ece13b7698 100644
--- a/tests/cluecode/data/ics/openssl-crypto-ec/ecp_mont.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-ec/ecp_mont.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved.
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-ec/ecp_nist.c.yml b/tests/cluecode/data/ics/openssl-crypto-ec/ecp_nist.c.yml
index 877694ad65..cc42c94b80 100644
--- a/tests/cluecode/data/ics/openssl-crypto-ec/ecp_nist.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-ec/ecp_nist.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1998-2003 The OpenSSL Project. All rights reserved.
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-ec/ecp_smpl.c.yml b/tests/cluecode/data/ics/openssl-crypto-ec/ecp_smpl.c.yml
index fb5d32da15..1ec0d7e5fe 100644
--- a/tests/cluecode/data/ics/openssl-crypto-ec/ecp_smpl.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-ec/ecp_smpl.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-ecdh/ecdh.h.yml b/tests/cluecode/data/ics/openssl-crypto-ecdh/ecdh.h.yml
index 8ce9263178..be2d2f5a08 100644
--- a/tests/cluecode/data/ics/openssl-crypto-ecdh/ecdh.h.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-ecdh/ecdh.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+  - Copyright (c) 2000-2002 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-ecdsa/ecdsatest.c.yml b/tests/cluecode/data/ics/openssl-crypto-ecdsa/ecdsatest.c.yml
index ba3b3146ab..c0cd918331 100644
--- a/tests/cluecode/data/ics/openssl-crypto-ecdsa/ecdsatest.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-ecdsa/ecdsatest.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2000-2005 The OpenSSL Project. All rights reserved.
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-ecdsa/ecs_asn1.c.yml b/tests/cluecode/data/ics/openssl-crypto-ecdsa/ecs_asn1.c.yml
index 7e86594809..273ec41afa 100644
--- a/tests/cluecode/data/ics/openssl-crypto-ecdsa/ecs_asn1.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-ecdsa/ecs_asn1.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2000-2002 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-engine/eng_all.c.yml b/tests/cluecode/data/ics/openssl-crypto-engine/eng_all.c.yml
index 857f198877..579b4c9f34 100644
--- a/tests/cluecode/data/ics/openssl-crypto-engine/eng_all.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-engine/eng_all.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2000-2001 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-engine/eng_cryptodev.c.yml b/tests/cluecode/data/ics/openssl-crypto-engine/eng_cryptodev.c.yml
index 6bd821a242..cd510f43cd 100644
--- a/tests/cluecode/data/ics/openssl-crypto-engine/eng_cryptodev.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-engine/eng_cryptodev.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Theo de Raadt
     count: 1
+allrights:
+  - Copyright (c) 2002 Bob Beck <beck@openbsd.org>
+  - Copyright (c) 2002 Theo de Raadt
+  - Copyright (c) 2002 Markus Friedl All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-engine/eng_dyn.c.yml b/tests/cluecode/data/ics/openssl-crypto-engine/eng_dyn.c.yml
index 67dc7b4694..edb8b4f0aa 100644
--- a/tests/cluecode/data/ics/openssl-crypto-engine/eng_dyn.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-engine/eng_dyn.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-engine/eng_err.c.yml b/tests/cluecode/data/ics/openssl-crypto-engine/eng_err.c.yml
index effdae986c..045d82a682 100644
--- a/tests/cluecode/data/ics/openssl-crypto-engine/eng_err.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-engine/eng_err.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1999-2010 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-engine/eng_fat.c.yml b/tests/cluecode/data/ics/openssl-crypto-engine/eng_fat.c.yml
index c374a1bee0..30fa5555d7 100644
--- a/tests/cluecode/data/ics/openssl-crypto-engine/eng_fat.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-engine/eng_fat.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1999-2001 The OpenSSL Project. All rights reserved.
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-engine/engine.h.yml b/tests/cluecode/data/ics/openssl-crypto-engine/engine.h.yml
index 7ae999d0a1..f3554067da 100644
--- a/tests/cluecode/data/ics/openssl-crypto-engine/engine.h.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-engine/engine.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1999-2004 The OpenSSL Project. All rights reserved.
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-evp/m_ecdsa.c.yml b/tests/cluecode/data/ics/openssl-crypto-evp/m_ecdsa.c.yml
index dad0c02a47..46b9cb2015 100644
--- a/tests/cluecode/data/ics/openssl-crypto-evp/m_ecdsa.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-evp/m_ecdsa.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-evp/m_sigver.c.yml b/tests/cluecode/data/ics/openssl-crypto-evp/m_sigver.c.yml
index d53e71e87f..9425e463df 100644
--- a/tests/cluecode/data/ics/openssl-crypto-evp/m_sigver.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-evp/m_sigver.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2006,2007 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-pem/pem_all.c.yml b/tests/cluecode/data/ics/openssl-crypto-pem/pem_all.c.yml
index 04df6a1fbd..f215bd295c 100644
--- a/tests/cluecode/data/ics/openssl-crypto-pem/pem_all.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-pem/pem_all.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-pkcs12/p12_crt.c.yml b/tests/cluecode/data/ics/openssl-crypto-pkcs12/p12_crt.c.yml
index 351ea883ba..fcf325fa13 100644
--- a/tests/cluecode/data/ics/openssl-crypto-pkcs12/p12_crt.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-pkcs12/p12_crt.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1999-2002 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-rand/rand_win.c.yml b/tests/cluecode/data/ics/openssl-crypto-rand/rand_win.c.yml
index aaf469a0bd..8231af6977 100644
--- a/tests/cluecode/data/ics/openssl-crypto-rand/rand_win.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-rand/rand_win.c.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved.
+  - (c) Copyright Microsoft Corp. 1993. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-ui/ui_compat.c.yml b/tests/cluecode/data/ics/openssl-crypto-ui/ui_compat.c.yml
index 04c2cd311a..d5fcf4d6f1 100644
--- a/tests/cluecode/data/ics/openssl-crypto-ui/ui_compat.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-ui/ui_compat.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2001-2002 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-ui/ui_openssl.c.yml b/tests/cluecode/data/ics/openssl-crypto-ui/ui_openssl.c.yml
index 0ca31041ee..79d8f54748 100644
--- a/tests/cluecode/data/ics/openssl-crypto-ui/ui_openssl.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-ui/ui_openssl.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 2001 The OpenSSL Project. All rights reserved.
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-x509/x509.h.yml b/tests/cluecode/data/ics/openssl-crypto-x509/x509.h.yml
index eab14eec4a..9810e0e5d0 100644
--- a/tests/cluecode/data/ics/openssl-crypto-x509/x509.h.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-x509/x509.h.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-x509v3/v3_alt.c.yml b/tests/cluecode/data/ics/openssl-crypto-x509v3/v3_alt.c.yml
index e9751d7034..205e2ad9b7 100644
--- a/tests/cluecode/data/ics/openssl-crypto-x509v3/v3_alt.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-x509v3/v3_alt.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1999-2003 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto-x509v3/v3_pci.c.yml b/tests/cluecode/data/ics/openssl-crypto-x509v3/v3_pci.c.yml
index bb3ef7ea83..573de90142 100644
--- a/tests/cluecode/data/ics/openssl-crypto-x509v3/v3_pci.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto-x509v3/v3_pci.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Kungliga Tekniska Hogskolan (Royal Institute of Technology, Stockholm, Sweden)
     count: 1
+allrights:
+  - Copyright (c) 2004 Kungliga Tekniska Hogskolan (Royal Institute of Technology, Stockholm, Sweden). All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto/LPdir_nyi.c.yml b/tests/cluecode/data/ics/openssl-crypto/LPdir_nyi.c.yml
index b19737fad1..0e081a6efd 100644
--- a/tests/cluecode/data/ics/openssl-crypto/LPdir_nyi.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto/LPdir_nyi.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Richard Levitte
     count: 1
+allrights:
+  - Copyright (c) 2004, Richard Levitte <richard@levitte.org> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto/cryptlib.c.yml b/tests/cluecode/data/ics/openssl-crypto/cryptlib.c.yml
index 8745969807..30031f8565 100644
--- a/tests/cluecode/data/ics/openssl-crypto/cryptlib.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto/cryptlib.c.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto/md32_common.h.yml b/tests/cluecode/data/ics/openssl-crypto/md32_common.h.yml
index 556bfabf9e..bfc006983c 100644
--- a/tests/cluecode/data/ics/openssl-crypto/md32_common.h.yml
+++ b/tests/cluecode/data/ics/openssl-crypto/md32_common.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto/mem_clr.c.yml b/tests/cluecode/data/ics/openssl-crypto/mem_clr.c.yml
index 4f8ef3b051..9138198f32 100644
--- a/tests/cluecode/data/ics/openssl-crypto/mem_clr.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto/mem_clr.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2001 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-crypto/o_str.c.yml b/tests/cluecode/data/ics/openssl-crypto/o_str.c.yml
index d2a9b9cbd2..e552543eca 100644
--- a/tests/cluecode/data/ics/openssl-crypto/o_str.c.yml
+++ b/tests/cluecode/data/ics/openssl-crypto/o_str.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2003 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-include-openssl/modes.h.yml b/tests/cluecode/data/ics/openssl-include-openssl/modes.h.yml
index e014cf805a..f058602cc1 100644
--- a/tests/cluecode/data/ics/openssl-include-openssl/modes.h.yml
+++ b/tests/cluecode/data/ics/openssl-include-openssl/modes.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 2008 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-include-openssl/ssl.h.yml b/tests/cluecode/data/ics/openssl-include-openssl/ssl.h.yml
index f7967388e9..187864b668 100644
--- a/tests/cluecode/data/ics/openssl-include-openssl/ssl.h.yml
+++ b/tests/cluecode/data/ics/openssl-include-openssl/ssl.h.yml
@@ -25,3 +25,9 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved.
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+  - Copyright 2005 Nokia. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-include-openssl/ssl3.h.yml b/tests/cluecode/data/ics/openssl-include-openssl/ssl3.h.yml
index c82bdc5550..8e3f865dc5 100644
--- a/tests/cluecode/data/ics/openssl-include-openssl/ssl3.h.yml
+++ b/tests/cluecode/data/ics/openssl-include-openssl/ssl3.h.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-include-openssl/tls1.h.yml b/tests/cluecode/data/ics/openssl-include-openssl/tls1.h.yml
index cf21443ad3..d8e80e252d 100644
--- a/tests/cluecode/data/ics/openssl-include-openssl/tls1.h.yml
+++ b/tests/cluecode/data/ics/openssl-include-openssl/tls1.h.yml
@@ -25,3 +25,9 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved.
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+  - Copyright 2005 Nokia. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-ssl/d1_both.c.yml b/tests/cluecode/data/ics/openssl-ssl/d1_both.c.yml
index 575a93c7a4..fcc921baf4 100644
--- a/tests/cluecode/data/ics/openssl-ssl/d1_both.c.yml
+++ b/tests/cluecode/data/ics/openssl-ssl/d1_both.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved.
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-ssl/d1_clnt.c.yml b/tests/cluecode/data/ics/openssl-ssl/d1_clnt.c.yml
index 2bc8442c3a..4866d5012a 100644
--- a/tests/cluecode/data/ics/openssl-ssl/d1_clnt.c.yml
+++ b/tests/cluecode/data/ics/openssl-ssl/d1_clnt.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved.
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-ssl/s2_lib.c.yml b/tests/cluecode/data/ics/openssl-ssl/s2_lib.c.yml
index ac81d058ee..118be50e6f 100644
--- a/tests/cluecode/data/ics/openssl-ssl/s2_lib.c.yml
+++ b/tests/cluecode/data/ics/openssl-ssl/s2_lib.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-ssl/s3_enc.c.yml b/tests/cluecode/data/ics/openssl-ssl/s3_enc.c.yml
index 39ba373d40..69046f7b1c 100644
--- a/tests/cluecode/data/ics/openssl-ssl/s3_enc.c.yml
+++ b/tests/cluecode/data/ics/openssl-ssl/s3_enc.c.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved.
+  - Copyright 2005 Nokia. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-ssl/s3_lib.c.yml b/tests/cluecode/data/ics/openssl-ssl/s3_lib.c.yml
index f7967388e9..187864b668 100644
--- a/tests/cluecode/data/ics/openssl-ssl/s3_lib.c.yml
+++ b/tests/cluecode/data/ics/openssl-ssl/s3_lib.c.yml
@@ -25,3 +25,9 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved.
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+  - Copyright 2005 Nokia. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-ssl/ssl_asn1.c.yml b/tests/cluecode/data/ics/openssl-ssl/ssl_asn1.c.yml
index ed9cecad04..7c2816251a 100644
--- a/tests/cluecode/data/ics/openssl-ssl/ssl_asn1.c.yml
+++ b/tests/cluecode/data/ics/openssl-ssl/ssl_asn1.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright 2005 Nokia. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-ssl/ssl_cert.c.yml b/tests/cluecode/data/ics/openssl-ssl/ssl_cert.c.yml
index 89260d6079..15fd08d9af 100644
--- a/tests/cluecode/data/ics/openssl-ssl/ssl_cert.c.yml
+++ b/tests/cluecode/data/ics/openssl-ssl/ssl_cert.c.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2007 The OpenSSL Project. All rights reserved.
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-ssl/ssltest.c.yml b/tests/cluecode/data/ics/openssl-ssl/ssltest.c.yml
index 179c608295..4089c4d4cc 100644
--- a/tests/cluecode/data/ics/openssl-ssl/ssltest.c.yml
+++ b/tests/cluecode/data/ics/openssl-ssl/ssltest.c.yml
@@ -25,3 +25,9 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved.
+  - Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
+  - Copyright 2005 Nokia. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl-ssl/t1_reneg.c.yml b/tests/cluecode/data/ics/openssl-ssl/t1_reneg.c.yml
index 79b257a465..7d8abaa4c5 100644
--- a/tests/cluecode/data/ics/openssl-ssl/t1_reneg.c.yml
+++ b/tests/cluecode/data/ics/openssl-ssl/t1_reneg.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
+  - Copyright (c) 1998-2009 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl/NOTICE.yml b/tests/cluecode/data/ics/openssl/NOTICE.yml
index 1afa0c6d92..3087560b81 100644
--- a/tests/cluecode/data/ics/openssl/NOTICE.yml
+++ b/tests/cluecode/data/ics/openssl/NOTICE.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1998-2011 The OpenSSL Project. All rights reserved.
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl/e_os.h.yml b/tests/cluecode/data/ics/openssl/e_os.h.yml
index b7f805459f..b0bd7e9c57 100644
--- a/tests/cluecode/data/ics/openssl/e_os.h.yml
+++ b/tests/cluecode/data/ics/openssl/e_os.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Tim Hudson
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+  - holder is Tim Hudson (tjh@cryptsoft.com).
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/openssl/e_os2.h.yml b/tests/cluecode/data/ics/openssl/e_os2.h.yml
index ac7c65f226..57f0cb5e45 100644
--- a/tests/cluecode/data/ics/openssl/e_os2.h.yml
+++ b/tests/cluecode/data/ics/openssl/e_os2.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The OpenSSL Project
     count: 1
+allrights:
+  - Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/oprofile-daemon-liblegacy/p_module.h.yml b/tests/cluecode/data/ics/oprofile-daemon-liblegacy/p_module.h.yml
index 678a5e37b7..43477d4042 100644
--- a/tests/cluecode/data/ics/oprofile-daemon-liblegacy/p_module.h.yml
+++ b/tests/cluecode/data/ics/oprofile-daemon-liblegacy/p_module.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Linux International
     count: 1
+allrights:
+  - Copyright 1996, 1997 Linux International.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/oprofile-doc/oprofile.1.in.yml b/tests/cluecode/data/ics/oprofile-doc/oprofile.1.in.yml
index 8215ca23fd..f8589e1a11 100644
--- a/tests/cluecode/data/ics/oprofile-doc/oprofile.1.in.yml
+++ b/tests/cluecode/data/ics/oprofile-doc/oprofile.1.in.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: University of Manchester, UK, John Levon, and others
     count: 1
+allrights:
+  - Copyright (c) 1998-2004 University of Manchester, UK, John Levon, and others.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/oprofile-events-ppc64-970MP/events.yml b/tests/cluecode/data/ics/oprofile-events-ppc64-970MP/events.yml
index 1f6429e75e..2aeacfc453 100644
--- a/tests/cluecode/data/ics/oprofile-events-ppc64-970MP/events.yml
+++ b/tests/cluecode/data/ics/oprofile-events-ppc64-970MP/events.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: OProfile authors
     count: 1
+allrights:
+  - Copyright OProfile authors
+  - Copyright (c) International Business Machines, 2007.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/oprofile-events-ppc64-970MP/unit_masks.yml b/tests/cluecode/data/ics/oprofile-events-ppc64-970MP/unit_masks.yml
index fb89b99888..e9ee8e4ce3 100644
--- a/tests/cluecode/data/ics/oprofile-events-ppc64-970MP/unit_masks.yml
+++ b/tests/cluecode/data/ics/oprofile-events-ppc64-970MP/unit_masks.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: OProfile authors
     count: 1
+allrights:
+  - Copyright OProfile authors
+  - Copyright (c) International Business Machines, 2006.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/oprofile-libutil++/sparse_array.h.yml b/tests/cluecode/data/ics/oprofile-libutil++/sparse_array.h.yml
index fa73a9e357..45273fcf17 100644
--- a/tests/cluecode/data/ics/oprofile-libutil++/sparse_array.h.yml
+++ b/tests/cluecode/data/ics/oprofile-libutil++/sparse_array.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: OProfile authors
     count: 1
+allrights:
+  - Copyright 2007 OProfile authors
+  - Copyright (c) International Business Machines, 2007.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ping/NOTICE.yml b/tests/cluecode/data/ics/ping/NOTICE.yml
index 548789e0f9..171970b2b7 100644
--- a/tests/cluecode/data/ics/ping/NOTICE.yml
+++ b/tests/cluecode/data/ics/ping/NOTICE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1989 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ping/ping.c.yml b/tests/cluecode/data/ics/ping/ping.c.yml
index 4cc5bcb115..e1c412a6db 100644
--- a/tests/cluecode/data/ics/ping/ping.c.yml
+++ b/tests/cluecode/data/ics/ping/ping.c.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 2
+allrights:
+  - Copyright (c) 1989 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 1989 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ping6/NOTICE.yml b/tests/cluecode/data/ics/ping6/NOTICE.yml
index f83d5ca9cd..f5ae21d6e1 100644
--- a/tests/cluecode/data/ics/ping6/NOTICE.yml
+++ b/tests/cluecode/data/ics/ping6/NOTICE.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997, and 1998 WIDE Project. All rights reserved.
+  - Copyright (c) 1989, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ping6/ping6.c.yml b/tests/cluecode/data/ics/ping6/ping6.c.yml
index f898003f87..e61c0e8fa6 100644
--- a/tests/cluecode/data/ics/ping6/ping6.c.yml
+++ b/tests/cluecode/data/ics/ping6/ping6.c.yml
@@ -15,3 +15,7 @@ holders_summary:
     count: 2
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997, and 1998 WIDE Project. All rights reserved.
+  - Copyright (c) 1989, 1993 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 1989, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd-include-net/ppp_defs.h.yml b/tests/cluecode/data/ics/ppp-pppd-include-net/ppp_defs.h.yml
index 90a8dec097..ee3842dbe5 100644
--- a/tests/cluecode/data/ics/ppp-pppd-include-net/ppp_defs.h.yml
+++ b/tests/cluecode/data/ics/ppp-pppd-include-net/ppp_defs.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Paul Mackerras
     count: 1
+allrights:
+  - Copyright (c) 1984 Paul Mackerras. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd-include-net/pppio.h.yml b/tests/cluecode/data/ics/ppp-pppd-include-net/pppio.h.yml
index fd65761c36..62d7ae0b52 100644
--- a/tests/cluecode/data/ics/ppp-pppd-include-net/pppio.h.yml
+++ b/tests/cluecode/data/ics/ppp-pppd-include-net/pppio.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Paul Mackerras
     count: 1
+allrights:
+  - Copyright (c) 1994 Paul Mackerras. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd-include-net/slcompress.h.yml b/tests/cluecode/data/ics/ppp-pppd-include-net/slcompress.h.yml
index 92637c0085..c8e45dce6d 100644
--- a/tests/cluecode/data/ics/ppp-pppd-include-net/slcompress.h.yml
+++ b/tests/cluecode/data/ics/ppp-pppd-include-net/slcompress.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1989 Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd-plugins-pppoatm/pppoatm.c.yml b/tests/cluecode/data/ics/ppp-pppd-plugins-pppoatm/pppoatm.c.yml
index 4ff8c4f988..96a78fdc13 100644
--- a/tests/cluecode/data/ics/ppp-pppd-plugins-pppoatm/pppoatm.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd-plugins-pppoatm/pppoatm.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Mitchell Blank Jr
     count: 1
+allrights:
+  - Copyright 2000 Mitchell Blank Jr.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd-plugins-radius/avpair.c.yml b/tests/cluecode/data/ics/ppp-pppd-plugins-radius/avpair.c.yml
index 03cceda68d..eec0059c7c 100644
--- a/tests/cluecode/data/ics/ppp-pppd-plugins-radius/avpair.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd-plugins-radius/avpair.c.yml
@@ -18,3 +18,7 @@ holders_summary:
     count: 1
   - value: The Regents of the University of Michigan and Merit Network, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1995 Lars Fenneberg
+  - Copyright 1992 Livingston Enterprises, Inc.
+  - Copyright 1992,1993, 1994,1995 The Regents of the University of Michigan and Merit Network, Inc. All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd-plugins-radius/config.c.yml b/tests/cluecode/data/ics/ppp-pppd-plugins-radius/config.c.yml
index 68f1eaa002..4ba5d46b79 100644
--- a/tests/cluecode/data/ics/ppp-pppd-plugins-radius/config.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd-plugins-radius/config.c.yml
@@ -18,3 +18,7 @@ holders_summary:
     count: 1
   - value: The Regents of the University of Michigan and Merit Network, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1995,1996,1997 Lars Fenneberg
+  - Copyright 1992 Livingston Enterprises, Inc.
+  - Copyright 1992,1993, 1994,1995 The Regents of the University of Michigan and Merit Network, Inc. All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd-plugins-radius/dict.c.yml b/tests/cluecode/data/ics/ppp-pppd-plugins-radius/dict.c.yml
index f05479dfd6..4a7fb77af6 100644
--- a/tests/cluecode/data/ics/ppp-pppd-plugins-radius/dict.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd-plugins-radius/dict.c.yml
@@ -22,3 +22,8 @@ holders_summary:
     count: 1
   - value: The Regents of the University of Michigan and Merit Network, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2002 Roaring Penguin Software Inc.
+  - Copyright (c) 1995,1996,1997 Lars Fenneberg
+  - Copyright 1992 Livingston Enterprises, Inc.
+  - Copyright 1992,1993, 1994,1995 The Regents of the University of Michigan and Merit Network, Inc. All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd-plugins-radius/includes.h.yml b/tests/cluecode/data/ics/ppp-pppd-plugins-radius/includes.h.yml
index 8ba87808ca..a2dfd430d0 100644
--- a/tests/cluecode/data/ics/ppp-pppd-plugins-radius/includes.h.yml
+++ b/tests/cluecode/data/ics/ppp-pppd-plugins-radius/includes.h.yml
@@ -18,3 +18,7 @@ holders_summary:
     count: 1
   - value: The Regents of the University of Michigan and Merit Network, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1997 Lars Fenneberg
+  - Copyright 1992 Livingston Enterprises, Inc.
+  - Copyright 1992,1993, 1994,1995 The Regents of the University of Michigan and Merit Network, Inc. All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd-plugins-radius/pathnames.h.yml b/tests/cluecode/data/ics/ppp-pppd-plugins-radius/pathnames.h.yml
index 374239d2ca..eae4c572c4 100644
--- a/tests/cluecode/data/ics/ppp-pppd-plugins-radius/pathnames.h.yml
+++ b/tests/cluecode/data/ics/ppp-pppd-plugins-radius/pathnames.h.yml
@@ -18,3 +18,7 @@ holders_summary:
     count: 1
   - value: The Regents of the University of Michigan and Merit Network, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1995,1996 Lars Fenneberg
+  - Copyright 1992 Livingston Enterprises, Inc.
+  - Copyright 1992,1993, 1994,1995 The Regents of the University of Michigan and Merit Network, Inc. All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd-plugins-radius/radiusclient.h.yml b/tests/cluecode/data/ics/ppp-pppd-plugins-radius/radiusclient.h.yml
index e46e767a57..e8d1abe2c0 100644
--- a/tests/cluecode/data/ics/ppp-pppd-plugins-radius/radiusclient.h.yml
+++ b/tests/cluecode/data/ics/ppp-pppd-plugins-radius/radiusclient.h.yml
@@ -18,3 +18,7 @@ holders_summary:
     count: 1
   - value: The Regents of the University of Michigan and Merit Network, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1995,1996,1997,1998 Lars Fenneberg
+  - Copyright 1992 Livingston Enterprises, Inc.
+  - Copyright 1992,1993, 1994,1995 The Regents of the University of Michigan and Merit Network, Inc. All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd-plugins-rp-pppoe/plugin.c.yml b/tests/cluecode/data/ics/ppp-pppd-plugins-rp-pppoe/plugin.c.yml
index 38aacae3d4..5b8530f319 100644
--- a/tests/cluecode/data/ics/ppp-pppd-plugins-rp-pppoe/plugin.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd-plugins-rp-pppoe/plugin.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Roaring Penguin Software Inc., Michal Ostrowski and Jamal Hadi Salim
     count: 1
+allrights:
+  - Copyright (c) 2001 by Roaring Penguin Software Inc., Michal Ostrowski and Jamal Hadi Salim.
+  - Copyright 2000 Michal Ostrowski <mostrows@styx.uwaterloo.ca> , Jamal Hadi Salim <hadi@cyberus.ca>
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd-plugins/minconn.c.yml b/tests/cluecode/data/ics/ppp-pppd-plugins/minconn.c.yml
index d1d4919ad9..7ddb6a2da6 100644
--- a/tests/cluecode/data/ics/ppp-pppd-plugins/minconn.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd-plugins/minconn.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Paul Mackerras
     count: 1
+allrights:
+  - Copyright (c) 1999 Paul Mackerras. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd-plugins/passprompt.c.yml b/tests/cluecode/data/ics/ppp-pppd-plugins/passprompt.c.yml
index fda3482881..d053430b8c 100644
--- a/tests/cluecode/data/ics/ppp-pppd-plugins/passprompt.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd-plugins/passprompt.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Paul Mackerras, Alan Curry
     count: 1
+allrights:
+  - Copyright 1999 Paul Mackerras, Alan Curry.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd-plugins/winbind.c.yml b/tests/cluecode/data/ics/ppp-pppd-plugins/winbind.c.yml
index 556296c0aa..a94dfbfffe 100644
--- a/tests/cluecode/data/ics/ppp-pppd-plugins/winbind.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd-plugins/winbind.c.yml
@@ -49,3 +49,16 @@ holders_summary:
     count: 1
   - value: Simo Sorce
     count: 1
+allrights:
+  - Copyright (c) 2003 Andrew Bartlet <abartlet@samba.org>
+  - Copyright 1999 Paul Mackerras, Alan Curry.
+  - Copyright (c) 2002 Roaring Penguin Software Inc.
+  - Copyright (c) 1996, Matjaz Godec <gody@elgo.si>
+  - Copyright (c) 1996, Lars Fenneberg <in5y050@public.uni-hamburg.de>
+  - Copyright (c) 1997, Miguel A.L. Paraz <map@iphil.net>
+  - Copyright (c) 1995,1996,1997,1998 Lars Fenneberg <lf@elemental.net>
+  - Copyright (c) 2002 Roaring Penguin Software Inc.
+  - Copyright (c) 2003, Sean E. Millichamp sean at bruenor dot org
+  - Copyright (c) Andrew Tridgell 1992-2001
+  - Copyright (c) Simo Sorce 2001-2002
+  - Copyright (c) Martin Pool 2003
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/NOTICE.yml b/tests/cluecode/data/ics/ppp-pppd/NOTICE.yml
index 90b0ece798..738f11639a 100644
--- a/tests/cluecode/data/ics/ppp-pppd/NOTICE.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/NOTICE.yml
@@ -57,3 +57,20 @@ holders_summary:
     count: 1
   - value: Tommi Komulainen
     count: 1
+allrights:
+  - Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
+  - Copyright (c) 1995 Pedro Roque Marques. All rights reserved.
+  - Copyright (c) 2000-2004 Paul Mackerras. All rights reserved.
+  - Copyright (c) 1994-2002 Paul Mackerras. All rights reserved.
+  - Copyright (c) 2003 Paul Mackerras. All rights reserved.
+  - Copyright (c) 1996-2002 Paul Mackerras. All rights reserved.
+  - Copyright (c) 1999-2004 Paul Mackerras. All rights reserved.
+  - Copyright (c) 2000-2002 Paul Mackerras. All rights reserved.
+  - Copyright (c) 1999-2002 Paul Mackerras. All rights reserved.
+  - Copyright (c) 1995 Eric Rosenquist. All rights reserved.
+  - Copyright (c) 2002 The Android Open Source Project
+  - Copyright (c) 1990, RSA Data Security, Inc. All rights reserved.
+  - Copyright (c) 2001 by Sun Microsystems, Inc. All rights reserved.
+  - Copyright (c) 1999 Tommi Komulainen. All rights reserved.
+  - Copyright (c) 1995, 1996, 1997 Francis.Dupont@inria.fr, INRIA
+  - Copyright (c) 1998, 1999 Francis.Dupont@inria.fr
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/auth.c.yml b/tests/cluecode/data/ics/ppp-pppd/auth.c.yml
index 01769d52ca..35a8645000 100644
--- a/tests/cluecode/data/ics/ppp-pppd/auth.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/auth.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Paul Mackerras
     count: 1
+allrights:
+  - Copyright (c) 1993-2002 Paul Mackerras. All rights reserved.
+  - Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/cbcp.c.yml b/tests/cluecode/data/ics/ppp-pppd/cbcp.c.yml
index 0f23d7871e..d46a3f2c65 100644
--- a/tests/cluecode/data/ics/ppp-pppd/cbcp.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/cbcp.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Pedro Roque Marques
     count: 1
+allrights:
+  - Copyright (c) 1995 Pedro Roque Marques. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/ccp.c.yml b/tests/cluecode/data/ics/ppp-pppd/ccp.c.yml
index 3360aa892a..95dbabf253 100644
--- a/tests/cluecode/data/ics/ppp-pppd/ccp.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/ccp.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Paul Mackerras
     count: 1
+allrights:
+  - Copyright (c) 1994-2002 Paul Mackerras. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/chap_ms.c.yml b/tests/cluecode/data/ics/ppp-pppd/chap_ms.c.yml
index 23fbd8624d..623030db4c 100644
--- a/tests/cluecode/data/ics/ppp-pppd/chap_ms.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/chap_ms.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Eric Rosenquist
     count: 1
+allrights:
+  - Copyright (c) 1995 Eric Rosenquist. All rights reserved.
+  - Copyright (c) 2002 The Android Open Source Project
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/chap_ms.h.yml b/tests/cluecode/data/ics/ppp-pppd/chap_ms.h.yml
index d3c29a5901..3bc5b01330 100644
--- a/tests/cluecode/data/ics/ppp-pppd/chap_ms.h.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/chap_ms.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Eric Rosenquist
     count: 1
+allrights:
+  - Copyright (c) 1995 Eric Rosenquist. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/demand.c.yml b/tests/cluecode/data/ics/ppp-pppd/demand.c.yml
index 4c3350fbd8..ec3fdf9ff5 100644
--- a/tests/cluecode/data/ics/ppp-pppd/demand.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/demand.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Paul Mackerras
     count: 1
+allrights:
+  - Copyright (c) 1996-2002 Paul Mackerras. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/eap.c.yml b/tests/cluecode/data/ics/ppp-pppd/eap.c.yml
index 3b5e26fec0..572ba2713e 100644
--- a/tests/cluecode/data/ics/ppp-pppd/eap.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/eap.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Sun Microsystems
     count: 1
+allrights:
+  - Copyright (c) 2001 by Sun Microsystems, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/ecp.c.yml b/tests/cluecode/data/ics/ppp-pppd/ecp.c.yml
index 4ab75d95a8..bf9f9843ab 100644
--- a/tests/cluecode/data/ics/ppp-pppd/ecp.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/ecp.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Paul Mackerras
     count: 1
+allrights:
+  - Copyright (c) 2002 The Android Open Source Project All rights reserved.
+  - Copyright (c) 1994-2002 Paul Mackerras. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/ecp.h.yml b/tests/cluecode/data/ics/ppp-pppd/ecp.h.yml
index c25338306e..44a1fab41a 100644
--- a/tests/cluecode/data/ics/ppp-pppd/ecp.h.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/ecp.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Android Open Source Project
     count: 1
+allrights:
+  - Copyright (c) 2002 The Android Open Source Project All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/eui64.c.yml b/tests/cluecode/data/ics/ppp-pppd/eui64.c.yml
index c654722738..ecb8740b83 100644
--- a/tests/cluecode/data/ics/ppp-pppd/eui64.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/eui64.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Tommi Komulainen
     count: 1
+allrights:
+  - Copyright (c) 1999 Tommi Komulainen. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/ipv6cp.c.yml b/tests/cluecode/data/ics/ppp-pppd/ipv6cp.c.yml
index ac43a157b2..3d2bba9faf 100644
--- a/tests/cluecode/data/ics/ppp-pppd/ipv6cp.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/ipv6cp.c.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: Tommi Komulainen
     count: 1
+allrights:
+  - Copyright (c) 1999 Tommi Komulainen. All rights reserved.
+  - Copyright (c) 1995, 1996, 1997 Francis.Dupont@inria.fr, INRIA
+  - Copyright (c) 1998, 1999 Francis.Dupont@inria.fr
+  - Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/main.c.yml b/tests/cluecode/data/ics/ppp-pppd/main.c.yml
index f8f0833f03..dd83e3deba 100644
--- a/tests/cluecode/data/ics/ppp-pppd/main.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/main.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Paul Mackerras
     count: 1
+allrights:
+  - Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
+  - Copyright (c) 1999-2004 Paul Mackerras. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/md5.c.yml b/tests/cluecode/data/ics/ppp-pppd/md5.c.yml
index 0bd497bba3..e023dae278 100644
--- a/tests/cluecode/data/ics/ppp-pppd/md5.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/md5.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: RSA Data Security, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1990, RSA Data Security, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/md5.h.yml b/tests/cluecode/data/ics/ppp-pppd/md5.h.yml
index 0bd497bba3..e023dae278 100644
--- a/tests/cluecode/data/ics/ppp-pppd/md5.h.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/md5.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: RSA Data Security, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1990, RSA Data Security, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/pppd.8.yml b/tests/cluecode/data/ics/ppp-pppd/pppd.8.yml
index 79e3019546..edfddb6a38 100644
--- a/tests/cluecode/data/ics/ppp-pppd/pppd.8.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/pppd.8.yml
@@ -41,3 +41,14 @@ holders_summary:
     count: 1
   - value: Tommi Komulainen
     count: 1
+allrights:
+  - Copyright (c) 1993-2003 Paul Mackerras <paulus@samba.org>
+  - Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
+  - Copyright (c) 1993-2004 Paul Mackerras. All rights reserved.
+  - Copyright (c) 1995 Pedro Roque Marques. All rights reserved.
+  - Copyright (c) 1995 Eric Rosenquist. All rights reserved.
+  - Copyright (c) 1999 Tommi Komulainen. All rights reserved.
+  - Copyright (c) Andrew Tridgell 1999
+  - Copyright (c) 2000 by Sun Microsystems, Inc. All rights reserved.
+  - Copyright (c) 2001 by Sun Microsystems, Inc. All rights reserved.
+  - Copyright (c) 2002 The Android Open Source Project
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/pppd.h.yml b/tests/cluecode/data/ics/ppp-pppd/pppd.h.yml
index af54413faa..9a3aa7d786 100644
--- a/tests/cluecode/data/ics/ppp-pppd/pppd.h.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/pppd.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Carnegie Mellon University
     count: 1
+allrights:
+  - Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/sys-linux.c.yml b/tests/cluecode/data/ics/ppp-pppd/sys-linux.c.yml
index f11a44083c..82d42a605b 100644
--- a/tests/cluecode/data/ics/ppp-pppd/sys-linux.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/sys-linux.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Paul Mackerras
     count: 1
+allrights:
+  - Copyright (c) 1994-2004 Paul Mackerras. All rights reserved.
+  - Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/sys-solaris.c.yml b/tests/cluecode/data/ics/ppp-pppd/sys-solaris.c.yml
index 5c020c9c97..ba891aae22 100644
--- a/tests/cluecode/data/ics/ppp-pppd/sys-solaris.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/sys-solaris.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Sun Microsystems
     count: 1
+allrights:
+  - Copyright (c) 2000 by Sun Microsystems, Inc. All rights reserved.
+  - Copyright (c) 1995-2002 Paul Mackerras. All rights reserved.
+  - Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/tty.c.yml b/tests/cluecode/data/ics/ppp-pppd/tty.c.yml
index 2f9d128fb8..395225a88e 100644
--- a/tests/cluecode/data/ics/ppp-pppd/tty.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/tty.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Paul Mackerras
     count: 1
+allrights:
+  - Copyright (c) 2000-2004 Paul Mackerras. All rights reserved.
+  - Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/ppp-pppd/utils.c.yml b/tests/cluecode/data/ics/ppp-pppd/utils.c.yml
index c0fbbae282..8a59adf699 100644
--- a/tests/cluecode/data/ics/ppp-pppd/utils.c.yml
+++ b/tests/cluecode/data/ics/ppp-pppd/utils.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Paul Mackerras
     count: 1
+allrights:
+  - Copyright (c) 1999-2002 Paul Mackerras. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/proguard-src-proguard-gui/GUIResources.properties.yml b/tests/cluecode/data/ics/proguard-src-proguard-gui/GUIResources.properties.yml
index 1edbcd4498..38e96adeb7 100644
--- a/tests/cluecode/data/ics/proguard-src-proguard-gui/GUIResources.properties.yml
+++ b/tests/cluecode/data/ics/proguard-src-proguard-gui/GUIResources.properties.yml
@@ -10,3 +10,6 @@ holders:
 holders_summary:
   - value: Eric Lafortune
     count: 1
+allrights:
+  - Copyright (c) 2002-2009 Eric Lafortune (eric@graphics.cornell.edu)
+  - Copyright (c) 2002-2009.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/proguard/NOTICE.yml b/tests/cluecode/data/ics/proguard/NOTICE.yml
index 749d5b067b..44d69390de 100644
--- a/tests/cluecode/data/ics/proguard/NOTICE.yml
+++ b/tests/cluecode/data/ics/proguard/NOTICE.yml
@@ -15,3 +15,7 @@ holders_summary:
     count: 2
   - value: Eric Lafortune
     count: 1
+allrights:
+  - Copyright (c) 2002-2009 Eric Lafortune.
+  - Copyright (c) 1989, 1991 Free Software Foundation, Inc.
+  - copyrighted by the Free Software Foundation
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/protobuf-editors/proto.vim.yml b/tests/cluecode/data/ics/protobuf-editors/proto.vim.yml
index 7a73bfbd2e..b738b560c5 100644
--- a/tests/cluecode/data/ics/protobuf-editors/proto.vim.yml
+++ b/tests/cluecode/data/ics/protobuf-editors/proto.vim.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2008 Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/protobuf-gtest-scons/SConscript.yml b/tests/cluecode/data/ics/protobuf-gtest-scons/SConscript.yml
index 7a73bfbd2e..c5514c0212 100644
--- a/tests/cluecode/data/ics/protobuf-gtest-scons/SConscript.yml
+++ b/tests/cluecode/data/ics/protobuf-gtest-scons/SConscript.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2008 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/protobuf-java-src-main-java-com-google-protobuf/AbstractMessage.java.yml b/tests/cluecode/data/ics/protobuf-java-src-main-java-com-google-protobuf/AbstractMessage.java.yml
index 7a73bfbd2e..b738b560c5 100644
--- a/tests/cluecode/data/ics/protobuf-java-src-main-java-com-google-protobuf/AbstractMessage.java.yml
+++ b/tests/cluecode/data/ics/protobuf-java-src-main-java-com-google-protobuf/AbstractMessage.java.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2008 Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/protobuf-src-google-protobuf-compiler-javamicro/javamicro_params.h.yml b/tests/cluecode/data/ics/protobuf-src-google-protobuf-compiler-javamicro/javamicro_params.h.yml
index fd28a94506..5911dd4246 100644
--- a/tests/cluecode/data/ics/protobuf-src-google-protobuf-compiler-javamicro/javamicro_params.h.yml
+++ b/tests/cluecode/data/ics/protobuf-src-google-protobuf-compiler-javamicro/javamicro_params.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2010 Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/protobuf-src-google-protobuf-io/tokenizer.cc.yml b/tests/cluecode/data/ics/protobuf-src-google-protobuf-io/tokenizer.cc.yml
index 7a73bfbd2e..b738b560c5 100644
--- a/tests/cluecode/data/ics/protobuf-src-google-protobuf-io/tokenizer.cc.yml
+++ b/tests/cluecode/data/ics/protobuf-src-google-protobuf-io/tokenizer.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2008 Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/protobuf-src-google-protobuf-stubs/structurally_valid.cc.yml b/tests/cluecode/data/ics/protobuf-src-google-protobuf-stubs/structurally_valid.cc.yml
index 3494c22524..146586ce08 100644
--- a/tests/cluecode/data/ics/protobuf-src-google-protobuf-stubs/structurally_valid.cc.yml
+++ b/tests/cluecode/data/ics/protobuf-src-google-protobuf-stubs/structurally_valid.cc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright 2005-2008 Google Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-audio/mixeng.c.yml b/tests/cluecode/data/ics/qemu-audio/mixeng.c.yml
index 0618ba5932..68a63adca2 100644
--- a/tests/cluecode/data/ics/qemu-audio/mixeng.c.yml
+++ b/tests/cluecode/data/ics/qemu-audio/mixeng.c.yml
@@ -15,3 +15,7 @@ holders_summary:
     count: 2
   - value: Vassili Karpov
     count: 1
+allrights:
+  - Copyright (c) 2004-2005 Vassili Karpov
+  - Copyright (c) 1998 Fabrice Bellard
+  - Copyright 1998 Fabrice Bellard.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-cdrom-macosx/SDLOSXCAGuard.c.yml b/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-cdrom-macosx/SDLOSXCAGuard.c.yml
index 35c8581184..54820d518a 100644
--- a/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-cdrom-macosx/SDLOSXCAGuard.c.yml
+++ b/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-cdrom-macosx/SDLOSXCAGuard.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Sam Lantinga
     count: 1
+allrights:
+  - Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+  - Copyright (c) Copyright 2002 Apple Computer, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-cdrom-macosx/SDLOSXCAGuard.h.yml b/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-cdrom-macosx/SDLOSXCAGuard.h.yml
index b2b79b932d..51278549cc 100644
--- a/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-cdrom-macosx/SDLOSXCAGuard.h.yml
+++ b/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-cdrom-macosx/SDLOSXCAGuard.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Sam Lantinga
     count: 1
+allrights:
+  - Copyright (c) 1997-2004 Sam Lantinga
+  - Copyright (c) Copyright 2002 Apple Computer, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-timer-macos/FastTimes.c.yml b/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-timer-macos/FastTimes.c.yml
index db88368cc4..a9c40fc28d 100644
--- a/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-timer-macos/FastTimes.c.yml
+++ b/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-timer-macos/FastTimes.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Matt Slot
     count: 1
+allrights:
+  - Copyright (c) Matt Slot, 1999-2000.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-Xext-Xv/Xvlibint.h.yml b/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-Xext-Xv/Xvlibint.h.yml
index 2f17a02448..25204ba500 100644
--- a/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-Xext-Xv/Xvlibint.h.yml
+++ b/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-Xext-Xv/Xvlibint.h.yml
@@ -12,3 +12,5 @@ holders_summary:
   - value: Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute
       of Technology, Cambridge, Massachusetts
     count: 1
+allrights:
+  - Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-Xext-extensions/Xv.h.yml b/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-Xext-extensions/Xv.h.yml
index cde6ba9ce7..0656ed25a3 100644
--- a/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-Xext-extensions/Xv.h.yml
+++ b/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-Xext-extensions/Xv.h.yml
@@ -12,3 +12,5 @@ holders_summary:
   - value: Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute
       of Technology, Cambridge, Massachusetts
     count: 1
+allrights:
+  - Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts, and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-Xext-extensions/panoramiXext.h.yml b/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-Xext-extensions/panoramiXext.h.yml
index b3b3451066..896c41f311 100644
--- a/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-Xext-extensions/panoramiXext.h.yml
+++ b/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-Xext-extensions/panoramiXext.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Digital Equipment Corporation, Maynard, Massachusetts
     count: 1
+allrights:
+  - Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-Xext-extensions/xme.h.yml b/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-Xext-extensions/xme.h.yml
index b4834749c2..49d9d619c9 100644
--- a/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-Xext-extensions/xme.h.yml
+++ b/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-Xext-extensions/xme.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Xi Graphics, Inc.
     count: 1
+allrights:
+  - Copyright 1993-2001 by Xi Graphics, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-fbcon/riva_mmio.h.yml b/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-fbcon/riva_mmio.h.yml
index c168e82a94..14f7151933 100644
--- a/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-fbcon/riva_mmio.h.yml
+++ b/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-fbcon/riva_mmio.h.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: NVIDIA, Corporation
     count: 2
+allrights:
+  - Copyright 1993-1999 NVIDIA, Corporation. All rights reserved.
+  - Copyright 1993-1999 NVIDIA, Corporation. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-maccommon/SDL_macwm.c.yml b/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-maccommon/SDL_macwm.c.yml
index d4c8c6e85f..1c45631174 100644
--- a/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-maccommon/SDL_macwm.c.yml
+++ b/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video-maccommon/SDL_macwm.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Sam Lantinga
     count: 1
+allrights:
+  - Copyright (c) 1997-2006 Sam Lantinga
+  - Copyright (c) 1999 Apple Computer, Inc., All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video/SDL_yuv_sw.c.yml b/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video/SDL_yuv_sw.c.yml
index 98c0ead2c6..8ae94ea473 100644
--- a/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video/SDL_yuv_sw.c.yml
+++ b/tests/cluecode/data/ics/qemu-distrib-sdl-1.2.12-src-video/SDL_yuv_sw.c.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1997-2006 Sam Lantinga
+  - Copyright (c) 1995 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 1995 Erik Corry All rights reserved.
+  - Copyright (c) 1995 Brown University. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-distrib-zlib-1.2.3/compress.c.yml b/tests/cluecode/data/ics/qemu-distrib-zlib-1.2.3/compress.c.yml
index 8b6fd6ee52..430013940a 100644
--- a/tests/cluecode/data/ics/qemu-distrib-zlib-1.2.3/compress.c.yml
+++ b/tests/cluecode/data/ics/qemu-distrib-zlib-1.2.3/compress.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jean-loup Gailly
     count: 1
+allrights:
+  - Copyright (c) 1995-2003 Jean-loup Gailly.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-distrib-zlib-1.2.3/deflate.c.yml b/tests/cluecode/data/ics/qemu-distrib-zlib-1.2.3/deflate.c.yml
index d279cd1cc0..409f151766 100644
--- a/tests/cluecode/data/ics/qemu-distrib-zlib-1.2.3/deflate.c.yml
+++ b/tests/cluecode/data/ics/qemu-distrib-zlib-1.2.3/deflate.c.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Jean-loup Gailly
     count: 2
+allrights:
+  - Copyright (c) 1995-2005 Jean-loup Gailly.
+  - Copyright 1995-2005 Jean-loup Gailly
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-distrib-zlib-1.2.3/gzio.c.yml b/tests/cluecode/data/ics/qemu-distrib-zlib-1.2.3/gzio.c.yml
index e46e3f037f..32808b9155 100644
--- a/tests/cluecode/data/ics/qemu-distrib-zlib-1.2.3/gzio.c.yml
+++ b/tests/cluecode/data/ics/qemu-distrib-zlib-1.2.3/gzio.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jean-loup Gailly
     count: 1
+allrights:
+  - Copyright (c) 1995-2005 Jean-loup Gailly.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-elff/dwarf.h.yml b/tests/cluecode/data/ics/qemu-elff/dwarf.h.yml
index 42f8b4bd54..e483db4ec5 100644
--- a/tests/cluecode/data/ics/qemu-elff/dwarf.h.yml
+++ b/tests/cluecode/data/ics/qemu-elff/dwarf.h.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Sun Microsystems
     count: 1
+allrights:
+  - Copyright (c) 2000,2001,2003,2004,2005,2006 Silicon Graphics, Inc. All Rights Reserved.
+  - Portions Copyright 2002,2007 Sun Microsystems, Inc. All rights reserved.
+  - Portions Copyright 2007-2009 David Anderson. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-hw/arm-misc.h.yml b/tests/cluecode/data/ics/qemu-hw/arm-misc.h.yml
index 42a4066dee..61615ca8df 100644
--- a/tests/cluecode/data/ics/qemu-hw/arm-misc.h.yml
+++ b/tests/cluecode/data/ics/qemu-hw/arm-misc.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: CodeSourcery
     count: 1
+allrights:
+  - Copyright (c) 2006 CodeSourcery.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-hw/armv7m.c.yml b/tests/cluecode/data/ics/qemu-hw/armv7m.c.yml
index 0603767ffd..65ab575859 100644
--- a/tests/cluecode/data/ics/qemu-hw/armv7m.c.yml
+++ b/tests/cluecode/data/ics/qemu-hw/armv7m.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: CodeSourcery
     count: 1
+allrights:
+  - Copyright (c) 2006-2007 CodeSourcery.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-hw/irq.c.yml b/tests/cluecode/data/ics/qemu-hw/irq.c.yml
index d819d91f18..0eaf79f29e 100644
--- a/tests/cluecode/data/ics/qemu-hw/irq.c.yml
+++ b/tests/cluecode/data/ics/qemu-hw/irq.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: CodeSourcery
     count: 1
+allrights:
+  - Copyright (c) 2007 CodeSourcery.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-hw/sd.h.yml b/tests/cluecode/data/ics/qemu-hw/sd.h.yml
index 90a003e3f9..0ec6edb92a 100644
--- a/tests/cluecode/data/ics/qemu-hw/sd.h.yml
+++ b/tests/cluecode/data/ics/qemu-hw/sd.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Pierre Ossman
     count: 1
+allrights:
+  - Copyright (c) 2005-2007 Pierre Ossman, All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-slirp/COPYRIGHT.yml b/tests/cluecode/data/ics/qemu-slirp/COPYRIGHT.yml
index 10c06c67a2..28837fde44 100644
--- a/tests/cluecode/data/ics/qemu-slirp/COPYRIGHT.yml
+++ b/tests/cluecode/data/ics/qemu-slirp/COPYRIGHT.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Danny Gasparovski
     count: 2
+allrights:
+  - Danny Gasparovski. Copyright (c), 1995,1996 All Rights Reserved.
+  - Copyright (c) 1995,1996 Danny Gasparovski. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-slirp/cksum.c.yml b/tests/cluecode/data/ics/qemu-slirp/cksum.c.yml
index 2ba422d667..bee9cc8390 100644
--- a/tests/cluecode/data/ics/qemu-slirp/cksum.c.yml
+++ b/tests/cluecode/data/ics/qemu-slirp/cksum.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1988, 1992, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-slirp/debug.c.yml b/tests/cluecode/data/ics/qemu-slirp/debug.c.yml
index 8765cf4eb2..03cf8f65d1 100644
--- a/tests/cluecode/data/ics/qemu-slirp/debug.c.yml
+++ b/tests/cluecode/data/ics/qemu-slirp/debug.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Kelly Price
     count: 1
+allrights:
+  - Copyright (c) 1995 Danny Gasparovski.
+  - Portions copyright (c) 2000 Kelly Price.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-slirp/debug.h.yml b/tests/cluecode/data/ics/qemu-slirp/debug.h.yml
index 08a839d421..c40332ef33 100644
--- a/tests/cluecode/data/ics/qemu-slirp/debug.h.yml
+++ b/tests/cluecode/data/ics/qemu-slirp/debug.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Danny Gasparovski
     count: 1
+allrights:
+  - Copyright (c) 1995 Danny Gasparovski.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-slirp/ip_icmp.c.yml b/tests/cluecode/data/ics/qemu-slirp/ip_icmp.c.yml
index 8883fd6063..15c7a90e38 100644
--- a/tests/cluecode/data/ics/qemu-slirp/ip_icmp.c.yml
+++ b/tests/cluecode/data/ics/qemu-slirp/ip_icmp.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1982, 1986, 1988, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-slirp/ip_input.c.yml b/tests/cluecode/data/ics/qemu-slirp/ip_input.c.yml
index c27ed920d0..49d44c9053 100644
--- a/tests/cluecode/data/ics/qemu-slirp/ip_input.c.yml
+++ b/tests/cluecode/data/ics/qemu-slirp/ip_input.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1982, 1986, 1988, 1993 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 1995 Danny Gasparovski.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-slirp/ip_output.c.yml b/tests/cluecode/data/ics/qemu-slirp/ip_output.c.yml
index 71522786d7..77d0f42f1a 100644
--- a/tests/cluecode/data/ics/qemu-slirp/ip_output.c.yml
+++ b/tests/cluecode/data/ics/qemu-slirp/ip_output.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1982, 1986, 1988, 1990, 1993 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 1995 Danny Gasparovski.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-slirp/misc.c.yml b/tests/cluecode/data/ics/qemu-slirp/misc.c.yml
index 08a839d421..c40332ef33 100644
--- a/tests/cluecode/data/ics/qemu-slirp/misc.c.yml
+++ b/tests/cluecode/data/ics/qemu-slirp/misc.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Danny Gasparovski
     count: 1
+allrights:
+  - Copyright (c) 1995 Danny Gasparovski.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-slirp/tcp_input.c.yml b/tests/cluecode/data/ics/qemu-slirp/tcp_input.c.yml
index 2ffbfe777e..a55ea39277 100644
--- a/tests/cluecode/data/ics/qemu-slirp/tcp_input.c.yml
+++ b/tests/cluecode/data/ics/qemu-slirp/tcp_input.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 1995 Danny Gasparovski.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-slirp/tcp_timer.c.yml b/tests/cluecode/data/ics/qemu-slirp/tcp_timer.c.yml
index 059a04e50c..4f247dcd28 100644
--- a/tests/cluecode/data/ics/qemu-slirp/tcp_timer.c.yml
+++ b/tests/cluecode/data/ics/qemu-slirp/tcp_timer.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1982, 1986, 1988, 1990, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-slirp/tcp_var.h.yml b/tests/cluecode/data/ics/qemu-slirp/tcp_var.h.yml
index 68e47e67b9..79e1148517 100644
--- a/tests/cluecode/data/ics/qemu-slirp/tcp_var.h.yml
+++ b/tests/cluecode/data/ics/qemu-slirp/tcp_var.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1982, 1986, 1993, 1994 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu-target-arm/neon_helper.c.yml b/tests/cluecode/data/ics/qemu-target-arm/neon_helper.c.yml
index 62fc4f7ea7..d259fa6bba 100644
--- a/tests/cluecode/data/ics/qemu-target-arm/neon_helper.c.yml
+++ b/tests/cluecode/data/ics/qemu-target-arm/neon_helper.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: CodeSourcery
     count: 1
+allrights:
+  - Copyright (c) 2007, 2008 CodeSourcery.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu/arm-semi.c.yml b/tests/cluecode/data/ics/qemu/arm-semi.c.yml
index bc4660a84e..617f6ff82c 100644
--- a/tests/cluecode/data/ics/qemu/arm-semi.c.yml
+++ b/tests/cluecode/data/ics/qemu/arm-semi.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: CodeSourcery
     count: 1
+allrights:
+  - Copyright (c) 2005, 2007 CodeSourcery.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu/d3des.c.yml b/tests/cluecode/data/ics/qemu/d3des.c.yml
index c22436fcb4..e58ff85d26 100644
--- a/tests/cluecode/data/ics/qemu/d3des.c.yml
+++ b/tests/cluecode/data/ics/qemu/d3des.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Richard Outerbridge
     count: 1
+allrights:
+  - Copyright (c) 1999 AT&T Laboratories Cambridge. All Rights Reserved.
+  - Copyright (c) 1988,1989,1990,1991,1992 by Richard Outerbridge.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu/d3des.h.yml b/tests/cluecode/data/ics/qemu/d3des.h.yml
index c22436fcb4..b2843d4753 100644
--- a/tests/cluecode/data/ics/qemu/d3des.h.yml
+++ b/tests/cluecode/data/ics/qemu/d3des.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Richard Outerbridge
     count: 1
+allrights:
+  - Copyright (c) 1999 AT&T Laboratories Cambridge. All Rights Reserved.
+  - Copyright (c) 1988,1989,1990,1991,1992 by Richard Outerbridge
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu/device_tree.c.yml b/tests/cluecode/data/ics/qemu/device_tree.c.yml
index dce7e561ff..7186250bf4 100644
--- a/tests/cluecode/data/ics/qemu/device_tree.c.yml
+++ b/tests/cluecode/data/ics/qemu/device_tree.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: IBM Corporation
     count: 1
+allrights:
+  - Copyright 2008 IBM Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu/loader.c.yml b/tests/cluecode/data/ics/qemu/loader.c.yml
index 3acceaa5f4..34e75b7206 100644
--- a/tests/cluecode/data/ics/qemu/loader.c.yml
+++ b/tests/cluecode/data/ics/qemu/loader.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Wolfgang Denk, DENX Software Engineering
     count: 1
+allrights:
+  - Copyright (c) 2006 Fabrice Bellard
+  - (c) Copyright 2008 Semihalf
+  - (c) Copyright 2000-2005 Wolfgang Denk, DENX Software Engineering, wd@denx.de.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu/softmmu-semi.h.yml b/tests/cluecode/data/ics/qemu/softmmu-semi.h.yml
index d819d91f18..0eaf79f29e 100644
--- a/tests/cluecode/data/ics/qemu/softmmu-semi.h.yml
+++ b/tests/cluecode/data/ics/qemu/softmmu-semi.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: CodeSourcery
     count: 1
+allrights:
+  - Copyright (c) 2007 CodeSourcery.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu/sys-tree.h.yml b/tests/cluecode/data/ics/qemu/sys-tree.h.yml
index 596c287996..38f3f4da49 100644
--- a/tests/cluecode/data/ics/qemu/sys-tree.h.yml
+++ b/tests/cluecode/data/ics/qemu/sys-tree.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Niels Provos
     count: 1
+allrights:
+  - Copyright 2002 Niels Provos <provos@citi.umich.edu> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/qemu/uboot_image.h.yml b/tests/cluecode/data/ics/qemu/uboot_image.h.yml
index 194c51f144..be7755bbd3 100644
--- a/tests/cluecode/data/ics/qemu/uboot_image.h.yml
+++ b/tests/cluecode/data/ics/qemu/uboot_image.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Wolfgang Denk, DENX Software Engineering
     count: 1
+allrights:
+  - (c) Copyright 2000-2005 Wolfgang Denk, DENX Software Engineering, wd@denx.de.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/quake-quake-src-QW-client/cd_linux.c.yml b/tests/cluecode/data/ics/quake-quake-src-QW-client/cd_linux.c.yml
index ea4cbe93d9..5406b453fb 100644
--- a/tests/cluecode/data/ics/quake-quake-src-QW-client/cd_linux.c.yml
+++ b/tests/cluecode/data/ics/quake-quake-src-QW-client/cd_linux.c.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Id Software, Inc.
     count: 2
+allrights:
+  - Copyright (c) 1996-1997 Id Software, Inc.
+  - (c) 1996 Id Software, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/quake-quake-src-QW-client/exitscrn.txt.yml b/tests/cluecode/data/ics/quake-quake-src-QW-client/exitscrn.txt.yml
index eb4dd9b6f9..1f0a6654f0 100644
--- a/tests/cluecode/data/ics/quake-quake-src-QW-client/exitscrn.txt.yml
+++ b/tests/cluecode/data/ics/quake-quake-src-QW-client/exitscrn.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Id Software, inc.
     count: 1
+allrights:
+  - (c) 1996, 1997 Id Software, inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/quake-quake-src-QW-client/md4.c.yml b/tests/cluecode/data/ics/quake-quake-src-QW-client/md4.c.yml
index 3f30915713..069e22fb8a 100644
--- a/tests/cluecode/data/ics/quake-quake-src-QW-client/md4.c.yml
+++ b/tests/cluecode/data/ics/quake-quake-src-QW-client/md4.c.yml
@@ -15,3 +15,7 @@ holders_summary:
     count: 2
   - value: Id Software, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1996-1997 Id Software, Inc.
+  - Copyright (c) 1991-2, RSA Data Security, Inc.
+  - Copyright (c) 1990-2, RSA Data Security, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/quake-quake-src-QW-client/menu.c.yml b/tests/cluecode/data/ics/quake-quake-src-QW-client/menu.c.yml
index 6bea267b1b..14cc04b35c 100644
--- a/tests/cluecode/data/ics/quake-quake-src-QW-client/menu.c.yml
+++ b/tests/cluecode/data/ics/quake-quake-src-QW-client/menu.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Id Software, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1996-1997 Id Software, Inc.
+  - (c) 1996 Id Software 0Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/quake-quake-src-QW-client/qwcl.plg.yml b/tests/cluecode/data/ics/quake-quake-src-QW-client/qwcl.plg.yml
index 4a0b0c38d1..c18ba24886 100644
--- a/tests/cluecode/data/ics/quake-quake-src-QW-client/qwcl.plg.yml
+++ b/tests/cluecode/data/ics/quake-quake-src-QW-client/qwcl.plg.yml
@@ -75,3 +75,38 @@ holders:
 holders_summary:
   - value: Microsoft
     count: 34
+allrights:
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/quake-quake-src-QW-dxsdk-sdk-inc/d3d.h.yml b/tests/cluecode/data/ics/quake-quake-src-QW-dxsdk-sdk-inc/d3d.h.yml
index 03f1bd498d..599253d920 100644
--- a/tests/cluecode/data/ics/quake-quake-src-QW-dxsdk-sdk-inc/d3d.h.yml
+++ b/tests/cluecode/data/ics/quake-quake-src-QW-dxsdk-sdk-inc/d3d.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Microsoft
     count: 1
+allrights:
+  - Copyright (c) 1995-1996 Microsoft Corporation. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/quake-quake-src-QW-dxsdk-sdk-inc/ddraw.h.yml b/tests/cluecode/data/ics/quake-quake-src-QW-dxsdk-sdk-inc/ddraw.h.yml
index d9e2917115..1967f3a41e 100644
--- a/tests/cluecode/data/ics/quake-quake-src-QW-dxsdk-sdk-inc/ddraw.h.yml
+++ b/tests/cluecode/data/ics/quake-quake-src-QW-dxsdk-sdk-inc/ddraw.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Microsoft
     count: 1
+allrights:
+  - Copyright (c) 1994-1996 Microsoft Corporation. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/quake-quake-src-QW-dxsdk-sdk-inc/dinput.h.yml b/tests/cluecode/data/ics/quake-quake-src-QW-dxsdk-sdk-inc/dinput.h.yml
index 44fd784733..ad81d8d894 100644
--- a/tests/cluecode/data/ics/quake-quake-src-QW-dxsdk-sdk-inc/dinput.h.yml
+++ b/tests/cluecode/data/ics/quake-quake-src-QW-dxsdk-sdk-inc/dinput.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Microsoft
     count: 1
+allrights:
+  - Copyright (c) 1996 Microsoft Corporation. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/quake-quake-src-QW-dxsdk-sdk-inc/dplay.h.yml b/tests/cluecode/data/ics/quake-quake-src-QW-dxsdk-sdk-inc/dplay.h.yml
index 4af00dce40..624187ab6f 100644
--- a/tests/cluecode/data/ics/quake-quake-src-QW-dxsdk-sdk-inc/dplay.h.yml
+++ b/tests/cluecode/data/ics/quake-quake-src-QW-dxsdk-sdk-inc/dplay.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Microsoft
     count: 1
+allrights:
+  - Copyright (c) 1994-1995 Microsoft Corporation. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/quake-quake-src-QW-dxsdk-sdk-inc/dsound.h.yml b/tests/cluecode/data/ics/quake-quake-src-QW-dxsdk-sdk-inc/dsound.h.yml
index 442fea1e05..5b53c3176a 100644
--- a/tests/cluecode/data/ics/quake-quake-src-QW-dxsdk-sdk-inc/dsound.h.yml
+++ b/tests/cluecode/data/ics/quake-quake-src-QW-dxsdk-sdk-inc/dsound.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Microsoft
     count: 1
+allrights:
+  - Copyright (c) 1995,1996 Microsoft Corporation. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/quake-quake-src-QW-scitech-include/debug.h.yml b/tests/cluecode/data/ics/quake-quake-src-QW-scitech-include/debug.h.yml
index a2c79b90d2..649d3d771c 100644
--- a/tests/cluecode/data/ics/quake-quake-src-QW-scitech-include/debug.h.yml
+++ b/tests/cluecode/data/ics/quake-quake-src-QW-scitech-include/debug.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: SciTech Software
     count: 1
+allrights:
+  - Copyright (c) 1996 SciTech Software All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/quake-quake-src-QW-scitech-include/mgldos.h.yml b/tests/cluecode/data/ics/quake-quake-src-QW-scitech-include/mgldos.h.yml
index a2c79b90d2..76904e9181 100644
--- a/tests/cluecode/data/ics/quake-quake-src-QW-scitech-include/mgldos.h.yml
+++ b/tests/cluecode/data/ics/quake-quake-src-QW-scitech-include/mgldos.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: SciTech Software
     count: 1
+allrights:
+  - Copyright (c) 1996 SciTech Software. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/quake-quake-src-WinQuake/3dfx.txt.yml b/tests/cluecode/data/ics/quake-quake-src-WinQuake/3dfx.txt.yml
index de49c73a1c..485a9ac62d 100644
--- a/tests/cluecode/data/ics/quake-quake-src-WinQuake/3dfx.txt.yml
+++ b/tests/cluecode/data/ics/quake-quake-src-WinQuake/3dfx.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: 3Dfx Interactive, Inc.
     count: 1
+allrights:
+  - Copyright ( 1997 3Dfx Interactive, Inc. ) All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/quake-quake-src-WinQuake/WinQuake.plg.yml b/tests/cluecode/data/ics/quake-quake-src-WinQuake/WinQuake.plg.yml
index 91e2bdb875..5ff5b2ad16 100644
--- a/tests/cluecode/data/ics/quake-quake-src-WinQuake/WinQuake.plg.yml
+++ b/tests/cluecode/data/ics/quake-quake-src-WinQuake/WinQuake.plg.yml
@@ -79,3 +79,40 @@ holders:
 holders_summary:
   - value: Microsoft
     count: 36
+allrights:
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
+  - Copyright (c) Microsoft Corp 1984-1998. All rights reserved.
+  - Copyright (c) Microsoft Corp 1981-1993. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/quake-quake-src-WinQuake/cl_input.cpp.yml b/tests/cluecode/data/ics/quake-quake-src-WinQuake/cl_input.cpp.yml
index ea4cbe93d9..5406b453fb 100644
--- a/tests/cluecode/data/ics/quake-quake-src-WinQuake/cl_input.cpp.yml
+++ b/tests/cluecode/data/ics/quake-quake-src-WinQuake/cl_input.cpp.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Id Software, Inc.
     count: 2
+allrights:
+  - Copyright (c) 1996-1997 Id Software, Inc.
+  - (c) 1996 Id Software, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/quake-quake-src-WinQuake/mpdosock.h.yml b/tests/cluecode/data/ics/quake-quake-src-WinQuake/mpdosock.h.yml
index 187e3df369..0c1ebfd8e0 100644
--- a/tests/cluecode/data/ics/quake-quake-src-WinQuake/mpdosock.h.yml
+++ b/tests/cluecode/data/ics/quake-quake-src-WinQuake/mpdosock.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1993-1995, Microsoft Corp. All rights reserved.
+  - Copyright (c) 1982-1986 Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/skia-include-ports/SkHarfBuzzFont.h.yml b/tests/cluecode/data/ics/skia-include-ports/SkHarfBuzzFont.h.yml
index f466e61366..02f723a161 100644
--- a/tests/cluecode/data/ics/skia-include-ports/SkHarfBuzzFont.h.yml
+++ b/tests/cluecode/data/ics/skia-include-ports/SkHarfBuzzFont.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Google
     count: 1
+allrights:
+  - Copyright (c) 2009, Google Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/skia-include-views/SkOSWindow_wxwidgets.h.yml b/tests/cluecode/data/ics/skia-include-views/SkOSWindow_wxwidgets.h.yml
index 97683f1659..d70c740dc5 100644
--- a/tests/cluecode/data/ics/skia-include-views/SkOSWindow_wxwidgets.h.yml
+++ b/tests/cluecode/data/ics/skia-include-views/SkOSWindow_wxwidgets.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: MyCompanyName
     count: 1
+allrights:
+  - Copyright (c) 2006 The Android Open Source Project
+  - Copyright 2005 MyCompanyName . All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/skia-src-opts/opts_check_arm.cpp.yml b/tests/cluecode/data/ics/skia-src-opts/opts_check_arm.cpp.yml
index 755eb17bc5..f5b87408ed 100644
--- a/tests/cluecode/data/ics/skia-src-opts/opts_check_arm.cpp.yml
+++ b/tests/cluecode/data/ics/skia-src-opts/opts_check_arm.cpp.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Code Aurora Forum
     count: 1
+allrights:
+  - Copyright (c) 2010, Code Aurora Forum. All rights reserved.
+  - Copyright 2006-2010, The Android Open Source Project
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/skia-tests/FillPathTest.cpp.yml b/tests/cluecode/data/ics/skia-tests/FillPathTest.cpp.yml
index 516f6c0097..e0322e9c79 100644
--- a/tests/cluecode/data/ics/skia-tests/FillPathTest.cpp.yml
+++ b/tests/cluecode/data/ics/skia-tests/FillPathTest.cpp.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Chromium Authors
     count: 1
+allrights:
+  - Copyright (c) 2010 The Chromium Authors. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/sonivox-arm-fm-22k-lib_src/eas_fmsndlib.c.yml b/tests/cluecode/data/ics/sonivox-arm-fm-22k-lib_src/eas_fmsndlib.c.yml
index 68100bb778..1e034e5b9b 100644
--- a/tests/cluecode/data/ics/sonivox-arm-fm-22k-lib_src/eas_fmsndlib.c.yml
+++ b/tests/cluecode/data/ics/sonivox-arm-fm-22k-lib_src/eas_fmsndlib.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Sonic Network, Inc.
     count: 1
+allrights:
+  - (c) Copyright 2005 Sonic Network, Inc. All Rights Reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/srtp-crypto-cipher/aes.c.yml b/tests/cluecode/data/ics/srtp-crypto-cipher/aes.c.yml
index e32eddba4f..d5fa0583b5 100644
--- a/tests/cluecode/data/ics/srtp-crypto-cipher/aes.c.yml
+++ b/tests/cluecode/data/ics/srtp-crypto-cipher/aes.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Cisco Systems
     count: 1
+allrights:
+  - Copyright (c) 2001-2006, Cisco Systems, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/srtp-crypto-hash/hmac.c.yml b/tests/cluecode/data/ics/srtp-crypto-hash/hmac.c.yml
index ac8236b2b0..9d84b13571 100644
--- a/tests/cluecode/data/ics/srtp-crypto-hash/hmac.c.yml
+++ b/tests/cluecode/data/ics/srtp-crypto-hash/hmac.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Cisco Systems
     count: 1
+allrights:
+  - Copyright (c) 2001-2006 Cisco Systems, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/srtp-crypto-include/auth.h.yml b/tests/cluecode/data/ics/srtp-crypto-include/auth.h.yml
index e32eddba4f..d5fa0583b5 100644
--- a/tests/cluecode/data/ics/srtp-crypto-include/auth.h.yml
+++ b/tests/cluecode/data/ics/srtp-crypto-include/auth.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Cisco Systems
     count: 1
+allrights:
+  - Copyright (c) 2001-2006, Cisco Systems, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/srtp-crypto-include/kernel_compat.h.yml b/tests/cluecode/data/ics/srtp-crypto-include/kernel_compat.h.yml
index 5130fa92c2..d51f1e6017 100644
--- a/tests/cluecode/data/ics/srtp-crypto-include/kernel_compat.h.yml
+++ b/tests/cluecode/data/ics/srtp-crypto-include/kernel_compat.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Ingate Systems AB
     count: 1
+allrights:
+  - Copyright (c) 2005 Ingate Systems AB All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/srtp-doc/intro.txt.yml b/tests/cluecode/data/ics/srtp-doc/intro.txt.yml
index 449777d6f1..94ca078cbb 100644
--- a/tests/cluecode/data/ics/srtp-doc/intro.txt.yml
+++ b/tests/cluecode/data/ics/srtp-doc/intro.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Cisco Systems
     count: 1
+allrights:
+  - Copyright (c) 2001-2005 Cisco Systems, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/srtp-doc/rfc3711.txt.yml b/tests/cluecode/data/ics/srtp-doc/rfc3711.txt.yml
index ba36c4ea93..758820ad07 100644
--- a/tests/cluecode/data/ics/srtp-doc/rfc3711.txt.yml
+++ b/tests/cluecode/data/ics/srtp-doc/rfc3711.txt.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: The Internet Society
     count: 2
+allrights:
+  - Copyright (c) The Internet Society (2004). All Rights Reserved.
+  - Copyright (c) The Internet Society (2004).
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/srtp-include/ekt.h.yml b/tests/cluecode/data/ics/srtp-include/ekt.h.yml
index 449777d6f1..94ca078cbb 100644
--- a/tests/cluecode/data/ics/srtp-include/ekt.h.yml
+++ b/tests/cluecode/data/ics/srtp-include/ekt.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Cisco Systems
     count: 1
+allrights:
+  - Copyright (c) 2001-2005 Cisco Systems, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/srtp/LICENSE.yml b/tests/cluecode/data/ics/srtp/LICENSE.yml
index ac8236b2b0..9d84b13571 100644
--- a/tests/cluecode/data/ics/srtp/LICENSE.yml
+++ b/tests/cluecode/data/ics/srtp/LICENSE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Cisco Systems
     count: 1
+allrights:
+  - Copyright (c) 2001-2006 Cisco Systems, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/stlport-stlport-stl/type_traits.h.yml b/tests/cluecode/data/ics/stlport-stlport-stl/type_traits.h.yml
index c64605f1e3..4f6a04ab31 100644
--- a/tests/cluecode/data/ics/stlport-stlport-stl/type_traits.h.yml
+++ b/tests/cluecode/data/ics/stlport-stlport-stl/type_traits.h.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: Silicon Graphics Computer Systems, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1996,1997 Silicon Graphics Computer Systems, Inc.
+  - Copyright (c) 1997 Moscow Center for SPARC Technology
+  - Copyright (c) 1999 Boris Fomitchev
+  - Copyright 2000 Adobe Systems Incorporated and others. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/stlport-test-eh/mwerks_console_OS_X.c.yml b/tests/cluecode/data/ics/stlport-test-eh/mwerks_console_OS_X.c.yml
index dba998726f..cc68ff869c 100644
--- a/tests/cluecode/data/ics/stlport-test-eh/mwerks_console_OS_X.c.yml
+++ b/tests/cluecode/data/ics/stlport-test-eh/mwerks_console_OS_X.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Metrowerks Corporation
     count: 1
+allrights:
+  - Copyright (c) 1995-2002 Metrowerks Corporation. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/stlport/LICENSE.yml b/tests/cluecode/data/ics/stlport/LICENSE.yml
index 8641181c0c..ff6e239201 100644
--- a/tests/cluecode/data/ics/stlport/LICENSE.yml
+++ b/tests/cluecode/data/ics/stlport/LICENSE.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: Silicon Graphics Computer Systems, Inc.
     count: 1
+allrights:
+  - Copyright 1999,2000 Boris Fomitchev
+  - Copyright 1994 Hewlett-Packard Company
+  - Copyright 1996,97 Silicon Graphics Computer Systems, Inc.
+  - Copyright 1997 Moscow Center for SPARC Technology.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/strace-linux/dummy.h.yml b/tests/cluecode/data/ics/strace-linux/dummy.h.yml
index 679ca1aa5a..d54c41cb98 100644
--- a/tests/cluecode/data/ics/strace-linux/dummy.h.yml
+++ b/tests/cluecode/data/ics/strace-linux/dummy.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Rick Sladkey
     count: 1
+allrights:
+  - Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+  - Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/strace-linux/ioctlent.sh.yml b/tests/cluecode/data/ics/strace-linux/ioctlent.sh.yml
index 02f4913bb0..52f24c1df6 100644
--- a/tests/cluecode/data/ics/strace-linux/ioctlent.sh.yml
+++ b/tests/cluecode/data/ics/strace-linux/ioctlent.sh.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Wichert Akkerman
     count: 1
+allrights:
+  - Copyright (c) 2001 Wichert Akkerman <wichert@cistron.nl> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/strace-strace-linux-ia64/syscallent.h.yml b/tests/cluecode/data/ics/strace-strace-linux-ia64/syscallent.h.yml
index 1cfef5477d..f3dcd2fac9 100644
--- a/tests/cluecode/data/ics/strace-strace-linux-ia64/syscallent.h.yml
+++ b/tests/cluecode/data/ics/strace-strace-linux-ia64/syscallent.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Hewlett-Packard Co David Mosberger-Tang
     count: 1
+allrights:
+  - Copyright (c) 1999, 2001 Hewlett-Packard Co David Mosberger-Tang <davidm@hpl.hp.com> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/strace-strace-linux-mips/ioctlent.sh.yml b/tests/cluecode/data/ics/strace-strace-linux-mips/ioctlent.sh.yml
index 062f6c0ffa..50a5e7b624 100644
--- a/tests/cluecode/data/ics/strace-strace-linux-mips/ioctlent.sh.yml
+++ b/tests/cluecode/data/ics/strace-strace-linux-mips/ioctlent.sh.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Rick Sladkey
     count: 1
+allrights:
+  - Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com> All rights reserved.
+  - Copyright (c) 1995, 1996 Michael Elizabeth Chastain <mec@duracef.shout.net> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/strace-strace-linux-sparc/syscall.h.yml b/tests/cluecode/data/ics/strace-strace-linux-sparc/syscall.h.yml
index 5bb6990e52..0d73a4a373 100644
--- a/tests/cluecode/data/ics/strace-strace-linux-sparc/syscall.h.yml
+++ b/tests/cluecode/data/ics/strace-strace-linux-sparc/syscall.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Rick Sladkey
     count: 1
+allrights:
+  - Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
+  - Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/strace/COPYRIGHT.yml b/tests/cluecode/data/ics/strace/COPYRIGHT.yml
index aa467dd111..8ae48d25cb 100644
--- a/tests/cluecode/data/ics/strace/COPYRIGHT.yml
+++ b/tests/cluecode/data/ics/strace/COPYRIGHT.yml
@@ -32,3 +32,10 @@ holders_summary:
 notes: |
   this is redundant and rare junk except in BSD and is not detected
           COPYRIGHT,v 1.3 2002/03/31 18:43:00 wichert
+allrights:
+  - Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
+  - Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+  - Copyright (c) 1993 Ulrich Pegelow <pegelow@moorea.uni-muenster.de>
+  - Copyright (c) 1995, 1996 Michael Elizabeth Chastain <mec@duracef.shout.net>
+  - Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
+  - Copyright (c) 1998-2001 Wichert Akkerman <wakkerma@deephackmode.org> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/strace/bjm.c.yml b/tests/cluecode/data/ics/strace/bjm.c.yml
index abe4c59508..33e784b9ef 100644
--- a/tests/cluecode/data/ics/strace/bjm.c.yml
+++ b/tests/cluecode/data/ics/strace/bjm.c.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: Wichert Akkerman
     count: 1
+allrights:
+  - Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
+  - Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+  - Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
+  - Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/strace/defs.h.yml b/tests/cluecode/data/ics/strace/defs.h.yml
index 51bfef96b4..173c75154f 100644
--- a/tests/cluecode/data/ics/strace/defs.h.yml
+++ b/tests/cluecode/data/ics/strace/defs.h.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Rick Sladkey
     count: 1
+allrights:
+  - Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
+  - Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+  - Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/strace/errnoent.sh.yml b/tests/cluecode/data/ics/strace/errnoent.sh.yml
index e2bd3dddea..786f9d6356 100644
--- a/tests/cluecode/data/ics/strace/errnoent.sh.yml
+++ b/tests/cluecode/data/ics/strace/errnoent.sh.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Rick Sladkey
     count: 1
+allrights:
+  - Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/strace/ioctl.c.yml b/tests/cluecode/data/ics/strace/ioctl.c.yml
index 18c780874d..832cf12956 100644
--- a/tests/cluecode/data/ics/strace/ioctl.c.yml
+++ b/tests/cluecode/data/ics/strace/ioctl.c.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: Wichert Akkerman
     count: 1
+allrights:
+  - Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
+  - Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+  - Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
+  - Copyright (c) 1996-2001 Wichert Akkerman <wichert@cistron.nl> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/strace/ioctlsort.c.yml b/tests/cluecode/data/ics/strace/ioctlsort.c.yml
index 6a1864ff63..e10aa04f0c 100644
--- a/tests/cluecode/data/ics/strace/ioctlsort.c.yml
+++ b/tests/cluecode/data/ics/strace/ioctlsort.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Rick Sladkey
     count: 1
+allrights:
+  - Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
+  - Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/strace/ipc.c.yml b/tests/cluecode/data/ics/strace/ipc.c.yml
index 180221886e..0b29ce9307 100644
--- a/tests/cluecode/data/ics/strace/ipc.c.yml
+++ b/tests/cluecode/data/ics/strace/ipc.c.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: Wichert Akkerman
     count: 1
+allrights:
+  - Copyright (c) 1993 Ulrich Pegelow <pegelow@moorea.uni-muenster.de>
+  - Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+  - Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
+  - Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/strace/net.c.yml b/tests/cluecode/data/ics/strace/net.c.yml
index 01db202b85..940878bbdd 100644
--- a/tests/cluecode/data/ics/strace/net.c.yml
+++ b/tests/cluecode/data/ics/strace/net.c.yml
@@ -21,3 +21,8 @@ holders_summary:
     count: 1
   - value: Wichert Akkerman
     count: 1
+allrights:
+  - Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
+  - Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+  - Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
+  - Copyright (c) 1996-2000 Wichert Akkerman <wichert@cistron.nl> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/strace/proc.c.yml b/tests/cluecode/data/ics/strace/proc.c.yml
index e2bd3dddea..786f9d6356 100644
--- a/tests/cluecode/data/ics/strace/proc.c.yml
+++ b/tests/cluecode/data/ics/strace/proc.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Rick Sladkey
     count: 1
+allrights:
+  - Copyright (c) 1993, 1994, 1995 Rick Sladkey <jrs@world.std.com> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/strace/signalent.sh.yml b/tests/cluecode/data/ics/strace/signalent.sh.yml
index 369d92eabe..c3dd59d1d8 100644
--- a/tests/cluecode/data/ics/strace/signalent.sh.yml
+++ b/tests/cluecode/data/ics/strace/signalent.sh.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Rick Sladkey
     count: 1
+allrights:
+  - Copyright (c) 1996 Rick Sladkey <jrs@world.std.com> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/strace/sock.c.yml b/tests/cluecode/data/ics/strace/sock.c.yml
index c9006f9427..f09a7d7342 100644
--- a/tests/cluecode/data/ics/strace/sock.c.yml
+++ b/tests/cluecode/data/ics/strace/sock.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Rick Sladkey
     count: 1
+allrights:
+  - Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/strace/strace.1.yml b/tests/cluecode/data/ics/strace/strace.1.yml
index 51bfef96b4..173c75154f 100644
--- a/tests/cluecode/data/ics/strace/strace.1.yml
+++ b/tests/cluecode/data/ics/strace/strace.1.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Rick Sladkey
     count: 1
+allrights:
+  - Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
+  - Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+  - Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/strace/stream.c.yml b/tests/cluecode/data/ics/strace/stream.c.yml
index 1507242df3..4895b7dc1a 100644
--- a/tests/cluecode/data/ics/strace/stream.c.yml
+++ b/tests/cluecode/data/ics/strace/stream.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Wichert Akkerman
     count: 1
+allrights:
+  - Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
+  - Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/strace/syscallent.sh.yml b/tests/cluecode/data/ics/strace/syscallent.sh.yml
index c9006f9427..f09a7d7342 100644
--- a/tests/cluecode/data/ics/strace/syscallent.sh.yml
+++ b/tests/cluecode/data/ics/strace/syscallent.sh.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Rick Sladkey
     count: 1
+allrights:
+  - Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/svox-pico-lib/picofftsg.c.yml b/tests/cluecode/data/ics/svox-pico-lib/picofftsg.c.yml
index d67770e9dd..4dd8176767 100644
--- a/tests/cluecode/data/ics/svox-pico-lib/picofftsg.c.yml
+++ b/tests/cluecode/data/ics/svox-pico-lib/picofftsg.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 1
   - value: Takuya OOURA
     count: 1
+allrights:
+  - Copyright (c) 2008-2009 SVOX AG
+  - Copyright (c) 2008-2009 SVOX AG, Baslerstr. 30, 8048 Zuerich, Switzerland All rights reserved.
+  - Copyright Takuya OOURA, 1996-2001
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/svox-pico-lib/picoos.c.yml b/tests/cluecode/data/ics/svox-pico-lib/picoos.c.yml
index 9b6787283a..9c3d7c526a 100644
--- a/tests/cluecode/data/ics/svox-pico-lib/picoos.c.yml
+++ b/tests/cluecode/data/ics/svox-pico-lib/picoos.c.yml
@@ -15,3 +15,7 @@ holders_summary:
     count: 2
   - value: SVOX AG, Baslerstr. 30, 8048 Zuerich, Switzerland
     count: 1
+allrights:
+  - Copyright (c) 2008-2009 SVOX AG
+  - Copyright (c) 2008-2009 SVOX AG, Baslerstr. 30, 8048 Zuerich, Switzerland All rights reserved.
+  - (c) SVOX AG
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/svox-pico_resources-tools-LingwareBuilding-PicoLingware_source_files-textana-en-GB/en-GB_lexpos.utf.yml b/tests/cluecode/data/ics/svox-pico_resources-tools-LingwareBuilding-PicoLingware_source_files-textana-en-GB/en-GB_lexpos.utf.yml
index f28163bf65..c8c2747ece 100644
--- a/tests/cluecode/data/ics/svox-pico_resources-tools-LingwareBuilding-PicoLingware_source_files-textana-en-GB/en-GB_lexpos.utf.yml
+++ b/tests/cluecode/data/ics/svox-pico_resources-tools-LingwareBuilding-PicoLingware_source_files-textana-en-GB/en-GB_lexpos.utf.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: SVOX AG, Baslerstr. 30, 8048 Zuerich, Switzerland
     count: 1
+allrights:
+  - Copyright (c) 2008-2009 SVOX AG, Baslerstr. 30, 8048 Zuerich, Switzerland ! All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/svox-pico_resources-tools-LingwareBuilding-PicoLingware_tools_windows-tools/buildbin.sh.yml b/tests/cluecode/data/ics/svox-pico_resources-tools-LingwareBuilding-PicoLingware_tools_windows-tools/buildbin.sh.yml
index 87b39fbdf3..b3099a8c12 100644
--- a/tests/cluecode/data/ics/svox-pico_resources-tools-LingwareBuilding-PicoLingware_tools_windows-tools/buildbin.sh.yml
+++ b/tests/cluecode/data/ics/svox-pico_resources-tools-LingwareBuilding-PicoLingware_tools_windows-tools/buildbin.sh.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: SVOX AG.
     count: 1
+allrights:
+  - Copyright (c) 2009 SVOX AG. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/svox-pico_resources-tools-LingwareBuilding/Readme.txt.yml b/tests/cluecode/data/ics/svox-pico_resources-tools-LingwareBuilding/Readme.txt.yml
index f28163bf65..c8c2747ece 100644
--- a/tests/cluecode/data/ics/svox-pico_resources-tools-LingwareBuilding/Readme.txt.yml
+++ b/tests/cluecode/data/ics/svox-pico_resources-tools-LingwareBuilding/Readme.txt.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: SVOX AG, Baslerstr. 30, 8048 Zuerich, Switzerland
     count: 1
+allrights:
+  - Copyright (c) 2008-2009 SVOX AG, Baslerstr. 30, 8048 Zuerich, Switzerland ! All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tagsoup-src-org-ccil-cowan-tagsoup/AutoDetector.java.yml b/tests/cluecode/data/ics/tagsoup-src-org-ccil-cowan-tagsoup/AutoDetector.java.yml
index cf1ae9df56..0e6a6aa022 100644
--- a/tests/cluecode/data/ics/tagsoup-src-org-ccil-cowan-tagsoup/AutoDetector.java.yml
+++ b/tests/cluecode/data/ics/tagsoup-src-org-ccil-cowan-tagsoup/AutoDetector.java.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: John Cowan
     count: 1
+allrights:
+  - Copyright 2002-2008 by John Cowan.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump-missing/inet_aton.c.yml b/tests/cluecode/data/ics/tcpdump-missing/inet_aton.c.yml
index 8ae879bfd8..b06063a63d 100644
--- a/tests/cluecode/data/ics/tcpdump-missing/inet_aton.c.yml
+++ b/tests/cluecode/data/ics/tcpdump-missing/inet_aton.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Kungliga Tekniska Hogskolan (Royal Institute of Technology, Stockholm, Sweden)
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Hogskolan (Royal Institute of Technology, Stockholm, Sweden). All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump-missing/inet_ntop.c.yml b/tests/cluecode/data/ics/tcpdump-missing/inet_ntop.c.yml
index 5bb997fb1b..963d3e2025 100644
--- a/tests/cluecode/data/ics/tcpdump-missing/inet_ntop.c.yml
+++ b/tests/cluecode/data/ics/tcpdump-missing/inet_ntop.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: Kungliga Tekniska Hogskolan (Royal Institute of Technology, Stockholm, Sweden)
     count: 1
+allrights:
+  - Copyright (c) 1999 Kungliga Tekniska Hogskolan (Royal Institute of Technology, Stockholm, Sweden). All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/Makefile.in.yml b/tests/cluecode/data/ics/tcpdump/Makefile.in.yml
index 9078088ca8..2b9a6907fc 100644
--- a/tests/cluecode/data/ics/tcpdump/Makefile.in.yml
+++ b/tests/cluecode/data/ics/tcpdump/Makefile.in.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/aclocal.m4.yml b/tests/cluecode/data/ics/tcpdump/aclocal.m4.yml
index 2b2d0f18b5..693540fed2 100644
--- a/tests/cluecode/data/ics/tcpdump/aclocal.m4.yml
+++ b/tests/cluecode/data/ics/tcpdump/aclocal.m4.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997, 1998 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 1999 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/addrtoname.c.yml b/tests/cluecode/data/ics/tcpdump/addrtoname.c.yml
index 95aae285c3..6250bab538 100644
--- a/tests/cluecode/data/ics/tcpdump/addrtoname.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/addrtoname.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/addrtoname.h.yml b/tests/cluecode/data/ics/tcpdump/addrtoname.h.yml
index 6992d79edb..9eb127bec1 100644
--- a/tests/cluecode/data/ics/tcpdump/addrtoname.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/addrtoname.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1990, 1992, 1993, 1994, 1995, 1996, 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/aodv.h.yml b/tests/cluecode/data/ics/tcpdump/aodv.h.yml
index 3616995a01..7a9db76160 100644
--- a/tests/cluecode/data/ics/tcpdump/aodv.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/aodv.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Bruce M. Simpson
     count: 1
+allrights:
+  - Copyright (c) 2003 Bruce M. Simpson <bms@spc.org> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/appletalk.h.yml b/tests/cluecode/data/ics/tcpdump/appletalk.h.yml
index 0d6afc5e5b..3b3c337829 100644
--- a/tests/cluecode/data/ics/tcpdump/appletalk.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/appletalk.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1988, 1989, 1990, 1993, 1994, 1995, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/atm.h.yml b/tests/cluecode/data/ics/tcpdump/atm.h.yml
index 455187f8fb..e889b340b1 100644
--- a/tests/cluecode/data/ics/tcpdump/atm.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/atm.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Guy Harris
     count: 1
+allrights:
+  - Copyright (c) 2002 Guy Harris. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/bootp.h.yml b/tests/cluecode/data/ics/tcpdump/bootp.h.yml
index 88fe14e8b8..1a4fca7714 100644
--- a/tests/cluecode/data/ics/tcpdump/bootp.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/bootp.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Carnegie Mellon
     count: 1
+allrights:
+  - Copyright 1988 by Carnegie Mellon.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/chdlc.h.yml b/tests/cluecode/data/ics/tcpdump/chdlc.h.yml
index 3511fcf913..b12cbb9de2 100644
--- a/tests/cluecode/data/ics/tcpdump/chdlc.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/chdlc.h.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/cpack.c.yml b/tests/cluecode/data/ics/tcpdump/cpack.c.yml
index 6e5d400e85..b39c210993 100644
--- a/tests/cluecode/data/ics/tcpdump/cpack.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/cpack.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: David Young
     count: 1
+allrights:
+  - Copyright (c) 2003, 2004 David Young. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/decnet.h.yml b/tests/cluecode/data/ics/tcpdump/decnet.h.yml
index b28a6193b5..f416482bb1 100644
--- a/tests/cluecode/data/ics/tcpdump/decnet.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/decnet.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1992, 1994, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/decode_prefix.h.yml b/tests/cluecode/data/ics/tcpdump/decode_prefix.h.yml
index 251f1cef34..93710e63a7 100644
--- a/tests/cluecode/data/ics/tcpdump/decode_prefix.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/decode_prefix.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 1999 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/enc.h.yml b/tests/cluecode/data/ics/tcpdump/enc.h.yml
index 948fb71730..1e1341cf1a 100644
--- a/tests/cluecode/data/ics/tcpdump/enc.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/enc.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: John Ioannidis, Angelos D. Keromytis and Niels Provos
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997, 1998 by John Ioannidis, Angelos D. Keromytis and Niels Provos.
+  - Copyright (c) 2001, Angelos D. Keromytis.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/gmt2local.c.yml b/tests/cluecode/data/ics/tcpdump/gmt2local.c.yml
index 1c47504871..3afda61d3c 100644
--- a/tests/cluecode/data/ics/tcpdump/gmt2local.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/gmt2local.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/icmp6.h.yml b/tests/cluecode/data/ics/tcpdump/icmp6.h.yml
index 21cd807acf..f330e95a76 100644
--- a/tests/cluecode/data/ics/tcpdump/icmp6.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/icmp6.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997, and 1998 WIDE Project. All rights reserved.
+  - Copyright (c) 1982, 1986, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/interface.h.yml b/tests/cluecode/data/ics/tcpdump/interface.h.yml
index 42390dbbb0..4c1cfe2de0 100644
--- a/tests/cluecode/data/ics/tcpdump/interface.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/interface.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1988-2002 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/ipproto.h.yml b/tests/cluecode/data/ics/tcpdump/ipproto.h.yml
index 532a96d8a8..9adbfa068e 100644
--- a/tests/cluecode/data/ics/tcpdump/ipproto.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/ipproto.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1982, 1986, 1990, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/l2tp.h.yml b/tests/cluecode/data/ics/tcpdump/l2tp.h.yml
index ac0525347a..6a61ef1d5f 100644
--- a/tests/cluecode/data/ics/tcpdump/l2tp.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/l2tp.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1991, 1993, 1994, 1995, 1996, 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/machdep.c.yml b/tests/cluecode/data/ics/tcpdump/machdep.c.yml
index 5f175072d7..c4bc0ca877 100644
--- a/tests/cluecode/data/ics/tcpdump/machdep.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/machdep.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1996, 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/makemib.yml b/tests/cluecode/data/ics/tcpdump/makemib.yml
index a9498b3b5f..96d44733fc 100644
--- a/tests/cluecode/data/ics/tcpdump/makemib.yml
+++ b/tests/cluecode/data/ics/tcpdump/makemib.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: William C. Fenner
     count: 1
+allrights:
+  - Copyright (c) 1990, 1996 John Robert LoVerso. All rights reserved.
+  - copyright (c) 1999 William C. Fenner.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/mpls.h.yml b/tests/cluecode/data/ics/tcpdump/mpls.h.yml
index 0127cc84b4..d352e95d6f 100644
--- a/tests/cluecode/data/ics/tcpdump/mpls.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/mpls.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 2001 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/nameser.h.yml b/tests/cluecode/data/ics/tcpdump/nameser.h.yml
index 88357d9759..3d4c9302c8 100644
--- a/tests/cluecode/data/ics/tcpdump/nameser.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/nameser.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1983, 1989, 1993 The Regents of the University of California. All rights reserved.
+  - Portions Copyright (c) 1993 by Digital Equipment Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/netdissect.h.yml b/tests/cluecode/data/ics/tcpdump/netdissect.h.yml
index b6d1ddf69e..65a033618d 100644
--- a/tests/cluecode/data/ics/tcpdump/netdissect.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/netdissect.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1988-1997 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 1998-2004 Michael Richardson <mcr@tcpdump.org> The TCPDUMP project
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/nfs.h.yml b/tests/cluecode/data/ics/tcpdump/nfs.h.yml
index 6599e7264d..b9bd31a001 100644
--- a/tests/cluecode/data/ics/tcpdump/nfs.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/nfs.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1989, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/nfsfh.h.yml b/tests/cluecode/data/ics/tcpdump/nfsfh.h.yml
index 3799a714c5..53c1479978 100644
--- a/tests/cluecode/data/ics/tcpdump/nfsfh.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/nfsfh.h.yml
@@ -14,3 +14,6 @@ holders_summary:
     count: 1
   - value: Jeffrey C. Mogul, Digital Equipment Corporation, Western Research Laboratory
     count: 1
+allrights:
+  - Copyright (c) 1993, 1994 Jeffrey C. Mogul, Digital Equipment Corporation, Western Research Laboratory. All rights reserved.
+  - Copyright (c) 2001 Compaq Computer Corporation. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/parsenfsfh.c.yml b/tests/cluecode/data/ics/tcpdump/parsenfsfh.c.yml
index 3799a714c5..53c1479978 100644
--- a/tests/cluecode/data/ics/tcpdump/parsenfsfh.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/parsenfsfh.c.yml
@@ -14,3 +14,6 @@ holders_summary:
     count: 1
   - value: Jeffrey C. Mogul, Digital Equipment Corporation, Western Research Laboratory
     count: 1
+allrights:
+  - Copyright (c) 1993, 1994 Jeffrey C. Mogul, Digital Equipment Corporation, Western Research Laboratory. All rights reserved.
+  - Copyright (c) 2001 Compaq Computer Corporation. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-ah.c.yml b/tests/cluecode/data/ics/tcpdump/print-ah.c.yml
index 7eafc812a4..c532e634ac 100644
--- a/tests/cluecode/data/ics/tcpdump/print-ah.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-ah.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-ap1394.c.yml b/tests/cluecode/data/ics/tcpdump/print-ap1394.c.yml
index 8639170775..e5317ff879 100644
--- a/tests/cluecode/data/ics/tcpdump/print-ap1394.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-ap1394.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-ascii.c.yml b/tests/cluecode/data/ics/tcpdump/print-ascii.c.yml
index 9daaf1b366..0727380cbd 100644
--- a/tests/cluecode/data/ics/tcpdump/print-ascii.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-ascii.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The NetBSD Foundation, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-atm.c.yml b/tests/cluecode/data/ics/tcpdump/print-atm.c.yml
index 10f8f0b4d1..dde435036e 100644
--- a/tests/cluecode/data/ics/tcpdump/print-atm.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-atm.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1994, 1995, 1996, 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-bootp.c.yml b/tests/cluecode/data/ics/tcpdump/print-bootp.c.yml
index 3511fcf913..b12cbb9de2 100644
--- a/tests/cluecode/data/ics/tcpdump/print-bootp.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-bootp.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-cdp.c.yml b/tests/cluecode/data/ics/tcpdump/print-cdp.c.yml
index d90292b46e..ecdd45dd0d 100644
--- a/tests/cluecode/data/ics/tcpdump/print-cdp.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-cdp.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-cnfp.c.yml b/tests/cluecode/data/ics/tcpdump/print-cnfp.c.yml
index d0bd46fcdc..dc3b2dab47 100644
--- a/tests/cluecode/data/ics/tcpdump/print-cnfp.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-cnfp.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Michael Shalayeff
     count: 1
+allrights:
+  - Copyright (c) 1998 Michael Shalayeff All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-dhcp6.c.yml b/tests/cluecode/data/ics/tcpdump/print-dhcp6.c.yml
index e8b58d72d7..db63a76401 100644
--- a/tests/cluecode/data/ics/tcpdump/print-dhcp6.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-dhcp6.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 1998 and 1999 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-dvmrp.c.yml b/tests/cluecode/data/ics/tcpdump/print-dvmrp.c.yml
index dc56284ab5..bb047cc764 100644
--- a/tests/cluecode/data/ics/tcpdump/print-dvmrp.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-dvmrp.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-egp.c.yml b/tests/cluecode/data/ics/tcpdump/print-egp.c.yml
index ca9b0c5454..36dd16b3b2 100644
--- a/tests/cluecode/data/ics/tcpdump/print-egp.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-egp.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-enc.c.yml b/tests/cluecode/data/ics/tcpdump/print-enc.c.yml
index c8016d2147..a9dcfc0f1b 100644
--- a/tests/cluecode/data/ics/tcpdump/print-enc.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-enc.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-fddi.c.yml b/tests/cluecode/data/ics/tcpdump/print-fddi.c.yml
index 95bb812606..ad7b564982 100644
--- a/tests/cluecode/data/ics/tcpdump/print-fddi.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-fddi.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996, 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-frag6.c.yml b/tests/cluecode/data/ics/tcpdump/print-frag6.c.yml
index 20b59f216d..548b49593d 100644
--- a/tests/cluecode/data/ics/tcpdump/print-frag6.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-frag6.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-gre.c.yml b/tests/cluecode/data/ics/tcpdump/print-gre.c.yml
index 17c82b0570..f95a095b17 100644
--- a/tests/cluecode/data/ics/tcpdump/print-gre.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-gre.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jason L. Wright
     count: 1
+allrights:
+  - Copyright (c) 2002 Jason L. Wright (jason@thought.net) All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-hsrp.c.yml b/tests/cluecode/data/ics/tcpdump/print-hsrp.c.yml
index 0c55a41bd8..2eafa3d59d 100644
--- a/tests/cluecode/data/ics/tcpdump/print-hsrp.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-hsrp.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Julian Cowley
     count: 1
+allrights:
+  - Copyright (c) 2001 Julian Cowley All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-ip6opts.c.yml b/tests/cluecode/data/ics/tcpdump/print-ip6opts.c.yml
index 0e8d791845..30f0570147 100644
--- a/tests/cluecode/data/ics/tcpdump/print-ip6opts.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-ip6opts.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 1998 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-krb.c.yml b/tests/cluecode/data/ics/tcpdump/print-krb.c.yml
index 9f2ea07ab2..1fb96a1d57 100644
--- a/tests/cluecode/data/ics/tcpdump/print-krb.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-krb.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-lwres.c.yml b/tests/cluecode/data/ics/tcpdump/print-lwres.c.yml
index 0127cc84b4..d352e95d6f 100644
--- a/tests/cluecode/data/ics/tcpdump/print-lwres.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-lwres.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 2001 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-mobile.c.yml b/tests/cluecode/data/ics/tcpdump/print-mobile.c.yml
index 1cdb021586..eb41e5b976 100644
--- a/tests/cluecode/data/ics/tcpdump/print-mobile.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-mobile.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The NetBSD Foundation, Inc.
     count: 1
+allrights:
+  - (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-mobility.c.yml b/tests/cluecode/data/ics/tcpdump/print-mobility.c.yml
index e63eb67b2d..aafa10f4cd 100644
--- a/tests/cluecode/data/ics/tcpdump/print-mobility.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-mobility.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 2002 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-msdp.c.yml b/tests/cluecode/data/ics/tcpdump/print-msdp.c.yml
index 15df4e439b..b20f16a2c2 100644
--- a/tests/cluecode/data/ics/tcpdump/print-msdp.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-msdp.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: William C. Fenner
     count: 1
+allrights:
+  - Copyright (c) 2001 William C. Fenner. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-radius.c.yml b/tests/cluecode/data/ics/tcpdump/print-radius.c.yml
index 2209833d0c..3d277b2be9 100644
--- a/tests/cluecode/data/ics/tcpdump/print-radius.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-radius.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Alfredo Andres Omella
     count: 1
+allrights:
+  - Copyright (c) 2000 Alfredo Andres Omella. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-rip.c.yml b/tests/cluecode/data/ics/tcpdump/print-rip.c.yml
index c3802601f0..39ef18f92b 100644
--- a/tests/cluecode/data/ics/tcpdump/print-rip.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-rip.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1989, 1990, 1991, 1993, 1994, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-ripng.c.yml b/tests/cluecode/data/ics/tcpdump/print-ripng.c.yml
index 28b9393d8f..dac81ce4a7 100644
--- a/tests/cluecode/data/ics/tcpdump/print-ripng.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-ripng.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1989, 1990, 1991, 1993, 1994 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-rx.c.yml b/tests/cluecode/data/ics/tcpdump/print-rx.c.yml
index 5ecc0a60fd..802853a449 100644
--- a/tests/cluecode/data/ics/tcpdump/print-rx.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-rx.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: United States Government as represented by the Secretary of the Navy
     count: 1
+allrights:
+  - Copyright (c) 2000 United States Government as represented by the Secretary of the Navy. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-sl.c.yml b/tests/cluecode/data/ics/tcpdump/print-sl.c.yml
index 7f3de7d5a4..3e934f6cae 100644
--- a/tests/cluecode/data/ics/tcpdump/print-sl.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-sl.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1989, 1990, 1991, 1993, 1994, 1995, 1996, 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-snmp.c.yml b/tests/cluecode/data/ics/tcpdump/print-snmp.c.yml
index 39f9b7db58..988d0fcc12 100644
--- a/tests/cluecode/data/ics/tcpdump/print-snmp.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-snmp.c.yml
@@ -15,3 +15,7 @@ holders_summary:
   - value: John Robert LoVerso
     count: 1
 notes: the second statement is truncated and should start with Los Alamos National Laboratory
+allrights:
+  - Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997 John Robert LoVerso. All rights reserved.
+  - J. Schoenwaelder, Copyright (c) 1999.
+  - Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-tcp.c.yml b/tests/cluecode/data/ics/tcpdump/print-tcp.c.yml
index 725d9dda17..3f527e51c5 100644
--- a/tests/cluecode/data/ics/tcpdump/print-tcp.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-tcp.c.yml
@@ -14,3 +14,6 @@ holders_summary:
     count: 1
   - value: The tcpdump.org project
     count: 1
+allrights:
+  - Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 1999-2004 The tcpdump.org project
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-telnet.c.yml b/tests/cluecode/data/ics/tcpdump/print-telnet.c.yml
index 23a81875d5..69f1f8646e 100644
--- a/tests/cluecode/data/ics/tcpdump/print-telnet.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-telnet.c.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: The NetBSD Foundation, Inc.
     count: 1
+allrights:
+  - Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. All rights reserved.
+  - Copyright (c) 1994, Simon J. Gerraty.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-timed.c.yml b/tests/cluecode/data/ics/tcpdump/print-timed.c.yml
index 21f55703f2..c6c3b9a86e 100644
--- a/tests/cluecode/data/ics/tcpdump/print-timed.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-timed.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Ben Smithurst
     count: 1
+allrights:
+  - Copyright (c) 2000 Ben Smithurst <ben@scientia.demon.co.uk> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-token.c.yml b/tests/cluecode/data/ics/tcpdump/print-token.c.yml
index 675c515055..f197f57dba 100644
--- a/tests/cluecode/data/ics/tcpdump/print-token.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-token.c.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-vrrp.c.yml b/tests/cluecode/data/ics/tcpdump/print-vrrp.c.yml
index c6d036403f..4fe91fd840 100644
--- a/tests/cluecode/data/ics/tcpdump/print-vrrp.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-vrrp.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: William C. Fenner
     count: 1
+allrights:
+  - Copyright (c) 2000 William C. Fenner. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-wb.c.yml b/tests/cluecode/data/ics/tcpdump/print-wb.c.yml
index 43ddee89b5..46e7362ae5 100644
--- a/tests/cluecode/data/ics/tcpdump/print-wb.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-wb.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1993, 1994, 1995, 1996 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/print-zephyr.c.yml b/tests/cluecode/data/ics/tcpdump/print-zephyr.c.yml
index de8b1ecec9..f9255520bd 100644
--- a/tests/cluecode/data/ics/tcpdump/print-zephyr.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/print-zephyr.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Nickolai Zeldovich
     count: 1
+allrights:
+  - Copyright (c) 2001 Nickolai Zeldovich <kolya@MIT.EDU> All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/route6d.h.yml b/tests/cluecode/data/ics/tcpdump/route6d.h.yml
index 1238c3fcd4..506f3bd6e7 100644
--- a/tests/cluecode/data/ics/tcpdump/route6d.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/route6d.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: WIDE Project
     count: 1
+allrights:
+  - Copyright (c) 1995, 1996, 1997 and 1998 WIDE Project. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/slcompress.h.yml b/tests/cluecode/data/ics/tcpdump/slcompress.h.yml
index fadfb625af..2672159039 100644
--- a/tests/cluecode/data/ics/tcpdump/slcompress.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/slcompress.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1989, 1990, 1992, 1993 Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/slip.h.yml b/tests/cluecode/data/ics/tcpdump/slip.h.yml
index 9bd24883fa..b5da83d88e 100644
--- a/tests/cluecode/data/ics/tcpdump/slip.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/slip.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1990 Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/strcasecmp.c.yml b/tests/cluecode/data/ics/tcpdump/strcasecmp.c.yml
index ebfb196211..a43daf3931 100644
--- a/tests/cluecode/data/ics/tcpdump/strcasecmp.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/strcasecmp.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1987 Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/tcpdump.1.yml b/tests/cluecode/data/ics/tcpdump/tcpdump.1.yml
index ad412b7ee7..5a7053cce3 100644
--- a/tests/cluecode/data/ics/tcpdump/tcpdump.1.yml
+++ b/tests/cluecode/data/ics/tcpdump/tcpdump.1.yml
@@ -10,3 +10,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996, 1997 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/tcpdump.c.yml b/tests/cluecode/data/ics/tcpdump/tcpdump.c.yml
index 428425c267..8036d7f275 100644
--- a/tests/cluecode/data/ics/tcpdump/tcpdump.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/tcpdump.c.yml
@@ -17,3 +17,7 @@ holders_summary:
     count: 2
   - value: Seth Webster
     count: 1
+allrights:
+  - Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000 The Regents of the University of California. All rights reserved.
+  - Copyright (c) 2001 Seth Webster <swebster@sst.ll.mit.edu>
+  - Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/telnet.h.yml b/tests/cluecode/data/ics/tcpdump/telnet.h.yml
index 8bb706cec4..fff97d96e9 100644
--- a/tests/cluecode/data/ics/tcpdump/telnet.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/telnet.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1983, 1993 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/token.h.yml b/tests/cluecode/data/ics/tcpdump/token.h.yml
index 15742d6e15..c2f7accb19 100644
--- a/tests/cluecode/data/ics/tcpdump/token.h.yml
+++ b/tests/cluecode/data/ics/tcpdump/token.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Larry Lile
     count: 1
+allrights:
+  - Copyright (c) 1998, Larry Lile All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tcpdump/vfprintf.c.yml b/tests/cluecode/data/ics/tcpdump/vfprintf.c.yml
index cd31170563..41323a052d 100644
--- a/tests/cluecode/data/ics/tcpdump/vfprintf.c.yml
+++ b/tests/cluecode/data/ics/tcpdump/vfprintf.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 1995 The Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tremolo-Tremolo/asm_arm.h.yml b/tests/cluecode/data/ics/tremolo-Tremolo/asm_arm.h.yml
index e371b21694..a3b799e142 100644
--- a/tests/cluecode/data/ics/tremolo-Tremolo/asm_arm.h.yml
+++ b/tests/cluecode/data/ics/tremolo-Tremolo/asm_arm.h.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Xiph.org Foundation
     count: 1
+allrights:
+  - Copyright (c) 2002-2009, Xiph.org Foundation
+  - Copyright (c) 2010, Robin Watts for Pinknoise Productions Ltd All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/tremolo/NOTICE.yml b/tests/cluecode/data/ics/tremolo/NOTICE.yml
index e371b21694..a3b799e142 100644
--- a/tests/cluecode/data/ics/tremolo/NOTICE.yml
+++ b/tests/cluecode/data/ics/tremolo/NOTICE.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Xiph.org Foundation
     count: 1
+allrights:
+  - Copyright (c) 2002-2009, Xiph.org Foundation
+  - Copyright (c) 2010, Robin Watts for Pinknoise Productions Ltd All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/webrtc-src-system_wrappers-source-spreadsortlib/spreadsort.hpp.yml b/tests/cluecode/data/ics/webrtc-src-system_wrappers-source-spreadsortlib/spreadsort.hpp.yml
index 892610a15d..681fdd83ad 100644
--- a/tests/cluecode/data/ics/webrtc-src-system_wrappers-source-spreadsortlib/spreadsort.hpp.yml
+++ b/tests/cluecode/data/ics/webrtc-src-system_wrappers-source-spreadsortlib/spreadsort.hpp.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Steven J. Ross
     count: 1
+allrights:
+  - Copyright Steven J. Ross 2001 - 2009.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/webrtc-src/common_types.h.yml b/tests/cluecode/data/ics/webrtc-src/common_types.h.yml
index 0d4e4d79a4..ae9a847cad 100644
--- a/tests/cluecode/data/ics/webrtc-src/common_types.h.yml
+++ b/tests/cluecode/data/ics/webrtc-src/common_types.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The WebRTC project authors
     count: 1
+allrights:
+  - Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/webrtc/NOTICE.yml b/tests/cluecode/data/ics/webrtc/NOTICE.yml
index d865c54a27..1b16bc3347 100644
--- a/tests/cluecode/data/ics/webrtc/NOTICE.yml
+++ b/tests/cluecode/data/ics/webrtc/NOTICE.yml
@@ -23,3 +23,9 @@ holders_summary:
     count: 1
   - value: The WebRTC project authors
     count: 1
+allrights:
+  - Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+  - Copyright (c) 2010 The Android Open Source Project
+  - Copyright Takuya OOURA, 1996-2001
+  - Copyright Takuya OOURA, 1996-2001
+  - Copyright Steven J. Ross 2001 - 2009.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/webrtc/android-webrtc.mk.yml b/tests/cluecode/data/ics/webrtc/android-webrtc.mk.yml
index 0d4e4d79a4..ae9a847cad 100644
--- a/tests/cluecode/data/ics/webrtc/android-webrtc.mk.yml
+++ b/tests/cluecode/data/ics/webrtc/android-webrtc.mk.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The WebRTC project authors
     count: 1
+allrights:
+  - Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/wpa_supplicant-wpa_gui-qt4/wpagui.cpp.yml b/tests/cluecode/data/ics/wpa_supplicant-wpa_gui-qt4/wpagui.cpp.yml
index 7ebdc99bde..9758ad5cce 100644
--- a/tests/cluecode/data/ics/wpa_supplicant-wpa_gui-qt4/wpagui.cpp.yml
+++ b/tests/cluecode/data/ics/wpa_supplicant-wpa_gui-qt4/wpagui.cpp.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Jouni Malinen and contributors
     count: 1
+allrights:
+  - Copyright (c) 2005-2008, Jouni Malinen <j@w1.fi>
+  - Copyright (c) 2003-2008, Jouni Malinen <j@w1.fi> and contributors.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/wpa_supplicant-wpa_gui/wpagui.ui.h.yml b/tests/cluecode/data/ics/wpa_supplicant-wpa_gui/wpagui.ui.h.yml
index 9cd63d886f..d33ec2b05f 100644
--- a/tests/cluecode/data/ics/wpa_supplicant-wpa_gui/wpagui.ui.h.yml
+++ b/tests/cluecode/data/ics/wpa_supplicant-wpa_gui/wpagui.ui.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jouni Malinen and contributors
     count: 1
+allrights:
+  - Copyright (c) 2003-2008, Jouni Malinen <j@w1.fi> and contributors.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/wpa_supplicant/NOTICE.yml b/tests/cluecode/data/ics/wpa_supplicant/NOTICE.yml
index 9cd63d886f..37d40fe520 100644
--- a/tests/cluecode/data/ics/wpa_supplicant/NOTICE.yml
+++ b/tests/cluecode/data/ics/wpa_supplicant/NOTICE.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jouni Malinen and contributors
     count: 1
+allrights:
+  - Copyright (c) 2003-2008, Jouni Malinen <j@w1.fi> and contributors All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/wpa_supplicant/driver_atmel.c.yml b/tests/cluecode/data/ics/wpa_supplicant/driver_atmel.c.yml
index 4b6ebd7003..ca8a44b0c4 100644
--- a/tests/cluecode/data/ics/wpa_supplicant/driver_atmel.c.yml
+++ b/tests/cluecode/data/ics/wpa_supplicant/driver_atmel.c.yml
@@ -15,3 +15,7 @@ holders_summary:
     count: 2
   - value: Jouni Malinen
     count: 1
+allrights:
+  - Copyright (c) 2000-2005, ATMEL Corporation
+  - Copyright (c) 2004-2007, Jouni Malinen <j@w1.fi>
+  - Copyright 2000-2001 ATMEL Corporation.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/wpa_supplicant/wireless_copy.h.yml b/tests/cluecode/data/ics/wpa_supplicant/wireless_copy.h.yml
index ce8328b0fc..db7503241e 100644
--- a/tests/cluecode/data/ics/wpa_supplicant/wireless_copy.h.yml
+++ b/tests/cluecode/data/ics/wpa_supplicant/wireless_copy.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jean Tourrilhes
     count: 1
+allrights:
+  - Copyright (c) 1997-2007 Jean Tourrilhes, All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/xmlwriter-src-org-jheer/XMLWriter.java.yml b/tests/cluecode/data/ics/xmlwriter-src-org-jheer/XMLWriter.java.yml
index b29b3a4a4d..abf593f4e3 100644
--- a/tests/cluecode/data/ics/xmlwriter-src-org-jheer/XMLWriter.java.yml
+++ b/tests/cluecode/data/ics/xmlwriter-src-org-jheer/XMLWriter.java.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: The Regents of the University of California
     count: 1
+allrights:
+  - Copyright (c) 2004-2006 Regents of the University of California. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/yaffs2-yaffs2/yaffs_qsort.h.yml b/tests/cluecode/data/ics/yaffs2-yaffs2/yaffs_qsort.h.yml
index e688bc6ca0..909c90d66f 100644
--- a/tests/cluecode/data/ics/yaffs2-yaffs2/yaffs_qsort.h.yml
+++ b/tests/cluecode/data/ics/yaffs2-yaffs2/yaffs_qsort.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Silicon Graphics, Inc.
     count: 1
+allrights:
+  - Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/zlib-contrib-masmx86/gvmat32c.c.yml b/tests/cluecode/data/ics/zlib-contrib-masmx86/gvmat32c.c.yml
index f5001c4fb5..1bfbb93bb9 100644
--- a/tests/cluecode/data/ics/zlib-contrib-masmx86/gvmat32c.c.yml
+++ b/tests/cluecode/data/ics/zlib-contrib-masmx86/gvmat32c.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jean-loup Gailly and Gilles Vollant
     count: 1
+allrights:
+  - Copyright (c) 1995-1996 Jean-loup Gailly and Gilles Vollant.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/zlib-contrib-minizip/unzip.c.yml b/tests/cluecode/data/ics/zlib-contrib-minizip/unzip.c.yml
index b91a88591b..f066dde67a 100644
--- a/tests/cluecode/data/ics/zlib-contrib-minizip/unzip.c.yml
+++ b/tests/cluecode/data/ics/zlib-contrib-minizip/unzip.c.yml
@@ -30,3 +30,11 @@ holders_summary:
     count: 1
   - value: Mathias Svensson
     count: 1
+allrights:
+  - Copyright (c) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+  - Copyright (c) 2007-2008 Even Rouault
+  - Copyright (c) 2009-2010 Mathias Svensson ( http://result42.com )
+  - Copyright (c) 1990-2000 Info-ZIP. All rights reserved.
+  - Copyright (c) 2007-2008 Even Rouault
+  - Copyright (c) 1998 - 2010 Gilles Vollant, Even Rouault, Mathias Svensson
+  - Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/zlib-contrib-pascal/readme.txt.yml b/tests/cluecode/data/ics/zlib-contrib-pascal/readme.txt.yml
index feaad1e115..f694dd2be2 100644
--- a/tests/cluecode/data/ics/zlib-contrib-pascal/readme.txt.yml
+++ b/tests/cluecode/data/ics/zlib-contrib-pascal/readme.txt.yml
@@ -27,3 +27,10 @@ holders_summary:
     count: 1
   - value: Jean-loup Gailly and Mark Adler
     count: 1
+allrights:
+  - Copyright (c) 1995-2003 Jean-loup Gailly and Mark Adler.
+  - Copyright (c) 1998 by Bob Dellaca.
+  - Copyright (c) 2003 by Cosmin Truta.
+  - Copyright (c) 1995-2003 by Jean-loup Gailly.
+  - Copyright (c) 1998,1999,2000 by Jacques Nomssi Nzali.
+  - Copyright (c) 2003 by Cosmin Truta.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/zlib-contrib-puff/puff.h.yml b/tests/cluecode/data/ics/zlib-contrib-puff/puff.h.yml
index 711176d63f..317b9545cc 100644
--- a/tests/cluecode/data/ics/zlib-contrib-puff/puff.h.yml
+++ b/tests/cluecode/data/ics/zlib-contrib-puff/puff.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Mark Adler
     count: 1
+allrights:
+  - Copyright (c) 2002-2010 Mark Adler, all rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/zlib-examples/gzappend.c.yml b/tests/cluecode/data/ics/zlib-examples/gzappend.c.yml
index 402af2de2b..d6799780e0 100644
--- a/tests/cluecode/data/ics/zlib-examples/gzappend.c.yml
+++ b/tests/cluecode/data/ics/zlib-examples/gzappend.c.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Mark Adler
     count: 2
+allrights:
+  - Copyright (c) 2003 Mark Adler, all rights reserved
+  - Copyright (c) 2003 Mark Adler
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/zlib-examples/gzjoin.c.yml b/tests/cluecode/data/ics/zlib-examples/gzjoin.c.yml
index a4bc8458bb..ae4707eb23 100644
--- a/tests/cluecode/data/ics/zlib-examples/gzjoin.c.yml
+++ b/tests/cluecode/data/ics/zlib-examples/gzjoin.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Mark Adler
     count: 1
+allrights:
+  - Copyright (c) 2004 Mark Adler, all rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/zlib-examples/gzlog.c.yml b/tests/cluecode/data/ics/zlib-examples/gzlog.c.yml
index 0d08abddbc..5dfe3c8ad2 100644
--- a/tests/cluecode/data/ics/zlib-examples/gzlog.c.yml
+++ b/tests/cluecode/data/ics/zlib-examples/gzlog.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Mark Adler
     count: 1
+allrights:
+  - Copyright (c) 2004, 2008 Mark Adler, all rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/zlib-examples/gzlog.h.yml b/tests/cluecode/data/ics/zlib-examples/gzlog.h.yml
index 0d08abddbc..5dfe3c8ad2 100644
--- a/tests/cluecode/data/ics/zlib-examples/gzlog.h.yml
+++ b/tests/cluecode/data/ics/zlib-examples/gzlog.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Mark Adler
     count: 1
+allrights:
+  - Copyright (c) 2004, 2008 Mark Adler, all rights reserved
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/zlib-examples/zlib_how.html.yml b/tests/cluecode/data/ics/zlib-examples/zlib_how.html.yml
index cdf876c742..165c25deea 100644
--- a/tests/cluecode/data/ics/zlib-examples/zlib_how.html.yml
+++ b/tests/cluecode/data/ics/zlib-examples/zlib_how.html.yml
@@ -11,3 +11,6 @@ holders:
 holders_summary:
   - value: Mark Adler
     count: 2
+allrights:
+  - Copyright (c) 2004, 2005 Mark Adler.
+  - Copyright (c) 2004, 2005 by Mark Adler
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/zlib-msdos/Makefile.dj2.yml b/tests/cluecode/data/ics/zlib-msdos/Makefile.dj2.yml
index d490f15e2e..592b24b4e0 100644
--- a/tests/cluecode/data/ics/zlib-msdos/Makefile.dj2.yml
+++ b/tests/cluecode/data/ics/zlib-msdos/Makefile.dj2.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jean-loup Gailly
     count: 1
+allrights:
+  - Copyright (c) 1995-1998 Jean-loup Gailly.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/zlib-old-visualc6/README.txt.yml b/tests/cluecode/data/ics/zlib-old-visualc6/README.txt.yml
index b59877d91c..7aebacc73e 100644
--- a/tests/cluecode/data/ics/zlib-old-visualc6/README.txt.yml
+++ b/tests/cluecode/data/ics/zlib-old-visualc6/README.txt.yml
@@ -13,3 +13,6 @@ holders_summary:
     count: 1
   - value: Simon-Pierre Cadieux
     count: 1
+allrights:
+  - Copyright (c) 2000-2004 Simon-Pierre Cadieux.
+  - Copyright (c) 2004 Cosmin Truta.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/zlib-win32/Makefile.gcc.yml b/tests/cluecode/data/ics/zlib-win32/Makefile.gcc.yml
index 8b6fd6ee52..430013940a 100644
--- a/tests/cluecode/data/ics/zlib-win32/Makefile.gcc.yml
+++ b/tests/cluecode/data/ics/zlib-win32/Makefile.gcc.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jean-loup Gailly
     count: 1
+allrights:
+  - Copyright (c) 1995-2003 Jean-loup Gailly.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/zlib/Makefile.in.yml b/tests/cluecode/data/ics/zlib/Makefile.in.yml
index ee2f302a9c..86e29a5f6a 100644
--- a/tests/cluecode/data/ics/zlib/Makefile.in.yml
+++ b/tests/cluecode/data/ics/zlib/Makefile.in.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jean-loup Gailly
     count: 1
+allrights:
+  - Copyright (c) 1995-2010 Jean-loup Gailly.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/zlib/example.c.yml b/tests/cluecode/data/ics/zlib/example.c.yml
index 3fb54b6625..3ca82d1789 100644
--- a/tests/cluecode/data/ics/zlib/example.c.yml
+++ b/tests/cluecode/data/ics/zlib/example.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jean-loup Gailly
     count: 1
+allrights:
+  - Copyright (c) 1995-2006 Jean-loup Gailly.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/zlib/minigzip.c.yml b/tests/cluecode/data/ics/zlib/minigzip.c.yml
index c91844657a..e5925baba6 100644
--- a/tests/cluecode/data/ics/zlib/minigzip.c.yml
+++ b/tests/cluecode/data/ics/zlib/minigzip.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jean-loup Gailly
     count: 1
+allrights:
+  - Copyright (c) 1995-2006, 2010 Jean-loup Gailly.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/zlib/uncompr.c.yml b/tests/cluecode/data/ics/zlib/uncompr.c.yml
index e6fa27d5d3..177ac68840 100644
--- a/tests/cluecode/data/ics/zlib/uncompr.c.yml
+++ b/tests/cluecode/data/ics/zlib/uncompr.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jean-loup Gailly
     count: 1
+allrights:
+  - Copyright (c) 1995-2003, 2010 Jean-loup Gailly.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/zlib/zconf.h.yml b/tests/cluecode/data/ics/zlib/zconf.h.yml
index ee2f302a9c..86e29a5f6a 100644
--- a/tests/cluecode/data/ics/zlib/zconf.h.yml
+++ b/tests/cluecode/data/ics/zlib/zconf.h.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jean-loup Gailly
     count: 1
+allrights:
+  - Copyright (c) 1995-2010 Jean-loup Gailly.
\ No newline at end of file
diff --git a/tests/cluecode/data/ics/zlib/zutil.c.yml b/tests/cluecode/data/ics/zlib/zutil.c.yml
index acea61756c..7a9dba837c 100644
--- a/tests/cluecode/data/ics/zlib/zutil.c.yml
+++ b/tests/cluecode/data/ics/zlib/zutil.c.yml
@@ -9,3 +9,5 @@ holders:
 holders_summary:
   - value: Jean-loup Gailly
     count: 1
+allrights:
+  - Copyright (c) 1995-2005, 2010 Jean-loup Gailly.
\ No newline at end of file
diff --git a/tests/cluecode/data/years/years_in_copyright-COPYRIGHT_madwifi.madwifi.yml b/tests/cluecode/data/years/years_in_copyright-COPYRIGHT_madwifi.madwifi.yml
index 2c21a15b7f..cff24b891e 100644
--- a/tests/cluecode/data/years/years_in_copyright-COPYRIGHT_madwifi.madwifi.yml
+++ b/tests/cluecode/data/years/years_in_copyright-COPYRIGHT_madwifi.madwifi.yml
@@ -2,3 +2,5 @@ what:
   - copyrights
 copyrights:
   - Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros Communications, Inc.
+allrights:
+  - Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros Communications, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/years/years_in_h-ah_h.h.yml b/tests/cluecode/data/years/years_in_h-ah_h.h.yml
index 2c21a15b7f..cff24b891e 100644
--- a/tests/cluecode/data/years/years_in_h-ah_h.h.yml
+++ b/tests/cluecode/data/years/years_in_h-ah_h.h.yml
@@ -2,3 +2,5 @@ what:
   - copyrights
 copyrights:
   - Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros Communications, Inc.
+allrights:
+  - Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros Communications, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/years/years_in_readme-README.yml b/tests/cluecode/data/years/years_in_readme-README.yml
index 93bee0468f..634b5573ba 100644
--- a/tests/cluecode/data/years/years_in_readme-README.yml
+++ b/tests/cluecode/data/years/years_in_readme-README.yml
@@ -2,3 +2,5 @@ what:
   - copyrights
 copyrights:
   - Copyright (c) 2002-2006, Jouni Malinen <jkmaline@cc.hut.fi> and contributors
+allrights:
+  - Copyright (c) 2002-2006, Jouni Malinen <jkmaline@cc.hut.fi> and contributors All Rights Reserved.
\ No newline at end of file
diff --git a/tests/cluecode/data/years/years_in_uuencode_binary-mips_be_elf_hal_o_uu.uu.yml b/tests/cluecode/data/years/years_in_uuencode_binary-mips_be_elf_hal_o_uu.uu.yml
index 2c21a15b7f..cff24b891e 100644
--- a/tests/cluecode/data/years/years_in_uuencode_binary-mips_be_elf_hal_o_uu.uu.yml
+++ b/tests/cluecode/data/years/years_in_uuencode_binary-mips_be_elf_hal_o_uu.uu.yml
@@ -2,3 +2,5 @@ what:
   - copyrights
 copyrights:
   - Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros Communications, Inc.
+allrights:
+  - Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros Communications, Inc. All rights reserved.
\ No newline at end of file
diff --git a/tests/cluecode/test_copyrights_with_allrightsreserved.py b/tests/cluecode/test_copyrights_with_allrightsreserved.py
new file mode 100644
index 0000000000..511274bf76
--- /dev/null
+++ b/tests/cluecode/test_copyrights_with_allrightsreserved.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) nexB Inc. and others. All rights reserved.
+# ScanCode is a trademark of nexB Inc.
+# SPDX-License-Identifier: Apache-2.0
+# See http://www.apache.org/licenses/LICENSE-2.0 for the license text.
+# See https://github.com/nexB/scancode-toolkit for support or download.
+# See https://aboutcode.org for more information about nexB OSS projects.
+#
+
+import pytest
+
+from commoncode.testcase import FileBasedTesting
+
+from cluecode_test_utils import build_tests
+from cluecode_test_utils import load_copyright_tests
+from scancode_config import REGEN_TEST_FIXTURES
+
+
+pytestmark = pytest.mark.scanslow
+
+
+"""
+This test suite is based on many sources including a rather large subset of
+Android ICS, providing a rather diversified sample of a typical Linux-based user
+space environment.
+"""
+
+class TestCopyrightDataDriven(FileBasedTesting):
+    # test functions are attached to this class at module import time
+    pass
+
+
+build_tests(
+    copyright_tests=load_copyright_tests(generate_missing=REGEN_TEST_FIXTURES),
+    clazz=TestCopyrightDataDriven,
+    regen=REGEN_TEST_FIXTURES,
+    with_allrights=True,
+)