@@ -253,6 +253,13 @@ The PostgreSQL software includes:
       src/port/pgmkdirp.c
       see licenses/LICENSE-bsd3-regents.txt
 
+      Headers derived from BSD getopt, which carry only a "Portions
+      Copyright (c) 1987, 1993, 1994 The Regents of the University of
+      California" line:
+      src/include/getopt_long.h
+      src/include/pg_getopt.h
+      see licenses/LICENSE-bsd3-regents.txt
+
       MD5 and SHA-1 implementations from the KAME project:
       src/common/md5.c
       src/common/md5_int.h
@@ -341,6 +348,7 @@ The PostgreSQL software includes:
 
       src/backend/regex
       src/include/regex
+      src/test/modules/test_regex (tests based on Tcl's tests/reg.test)
       see licenses/LICENSE-regex.txt
 
 ----------------------------
@@ -478,15 +486,21 @@ Greenplum Database
 
 Copyright (c) 2004-2020 VMware, Inc. or its affiliates. All Rights Reserved.
 
-All Rights Reserved.
+Greenplum Database is licensed under the Apache License Version 2.0 (see
+the top of this file) and is based on the PostgreSQL Database Management
+System.
 
-Some ORCA query optimizer files that Greenplum Database added in 2024
-carry a "Copyright (C) 2024 Broadcom" or "Copyright (C) 2024 VMware by
-Broadcom" notice instead; they are part of Greenplum Database and are
-covered by the same license.
+Files that came from Greenplum Database carry the copyright notice of
+whoever owned the code when they were written: Greenplum, Inc., EMC
+Corporation, Pivotal Software, VMware, Inc., or, for some ORCA query
+optimizer files added in 2024, "Copyright (C) 2024 Broadcom" or
+"Copyright (C) 2024 VMware by Broadcom".  Three management scripts carry
+a legacy "Copyright (c) Metapa 2005" notice; Metapa was one of the two
+companies that merged to form Greenplum:
 
-Greenplum Database is licensed under the Apache License Version 2.0
-(see LICENSE) and is based on the PostgreSQL Database Management System.
+   gpMgmt/bin/gpinitsystem
+   gpMgmt/bin/lib/gp_bash_functions.sh
+   gpMgmt/bin/lib/gpcreateseg.sh
 
 The Greenplum Database software includes:
 
@@ -513,6 +527,13 @@ The Greenplum Database software includes:
       (see the Apache License above; also shipped in-tree as
        src/test/unit/cmockery/LICENSE.txt)
 
+      googlemock's class generator, copyright 2007-2009 Google Inc. and
+      Neal Norwitz, bundled with the googletest copy below but under the
+      Apache License rather than googletest's BSD license:
+      gpcontrib/gpcloud/test/googletest/googlemock/scripts/generator
+      (see the Apache License above; also shipped in-tree as
+       gpcontrib/gpcloud/test/googletest/googlemock/scripts/generator/LICENSE)
+
 ----------------------------
    BSD 2 Clause License
 
@@ -541,6 +562,8 @@ The Greenplum Database software includes:
       see licenses/LICENSE-googletest.txt
 
       gpcontrib/pg_hint_plan/*
+      src/include/optimizer/hints.h (duplicates structures from
+      pg_hint_plan.c so the hint parser can be used outside the extension)
       see licenses/LICENSE-pg-hint-plan.txt
 
 ----------------------------
@@ -690,3 +713,77 @@ Apache Cloudberry includes codes from
       see licenses/LICENSE-amalgamate.txt
       (also shipped in-tree as
        contrib/pax_storage/src/cpp/contrib/tabulate/utils/amalgamate/LICENSE.md)
+
+================================================================================
+Build system files
+
+The files under config/ come from the GNU Autotools (Autoconf, Automake
+and Libtool), pkg-config and the Autoconf Archive.  The GPL-licensed
+ones carry an exception for use in configure scripts generated by
+Autoconf, which is the basis on which the ASF allows such build-tool
+files in its distributions
+(https://www.apache.org/legal/resolved.html#build-tools; see also
+LEGAL-290).  Each file carries its full license notice.  The top-level
+configure script is generated by Autoconf, includes expansions of these
+macros, and carries its own notice; it is listed below.
+
+----------------------------
+   GNU General Public License, with an exception for use in configure
+   scripts generated by Autoconf
+
+      config/config.guess
+         Copyright 1992-2021 Free Software Foundation, Inc.
+      config/config.sub
+         Copyright 1992-2021 Free Software Foundation, Inc.
+      (GPL-3.0-or-later)
+
+      config/check_decls.m4
+         (no copyright line of its own: based on commit
+          82ef7805faffa151e724aa76c245ec590d174580 of Autoconf and
+          distributed under Autoconf's license, GPL-3.0-or-later with
+          the Autoconf Configure Script Exception 3.0)
+
+      config/libtool.m4
+         Copyright (C) 1996-1999,2000 Free Software Foundation, Inc.
+      (GPL-2.0-or-later)
+
+      config/pkg.m4
+         Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+         Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+      (GPL-2.0-or-later)
+
+      config/ax_pthread.m4, from the Autoconf Archive
+         Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+         Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
+      (GPL-3.0-or-later with the Autoconf Macro exception)
+
+----------------------------
+   FSF All-Permissive License
+
+      configure, generated by GNU Autoconf 2.69
+         Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+
+      Macros from the Autoconf Archive:
+
+      config/ax_compare_version.m4
+         Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu>
+
+      config/ax_cxx_compile_stdcxx.m4
+         Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
+         Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
+         Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
+         Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
+         Copyright (c) 2015 Paul Norman <penorman@mac.com>
+         Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
+         Copyright (c) 2016, 2018 Krzesimir Nowak <qdlacz@gmail.com>
+         Copyright (c) 2019 Enji Cooper <yaneurabeya@gmail.com>
+
+      config/ax_python_module.m4
+         Copyright (c) 2008 Andrew Collier
+
+----------------------------
+   X11 License
+
+      config/install-sh
+         Copyright (C) 1994 X Consortium
+      (the Free Software Foundation's changes to it are in the public domain)
@@ -27,17 +27,18 @@ This file documents licensing clarifications and exceptions as part of ASF relea
 
 This file is licensed under the GPL (Category X) and has been removed from the source tree to comply with ASF release policy.
 
-## Historical Attribution Under Apache License 2.0
+## Historical Copyright Notices in Greenplum-based Code
 
-The following entities have contributed to the Greenplum-based source code under the Apache License 2.0:
+Files that came from Greenplum Database carry the copyright notices of the companies that owned the code when it was written:
 
+- Metapa (one of the two companies that merged to form Greenplum)
 - Greenplum, Inc.
 - EMC Corporation
-- VMware, Inc.
 - Pivotal Software
+- VMware, Inc.
 - Broadcom Inc.
 
-RAT matchers are used to classify their license headers accordingly.
+Greenplum Database was released under the Apache License 2.0 in 2015, and these files are distributed under that license. RAT matchers are used to classify their license headers accordingly.
 
 ## Compressed Files in Source
 
 
@@ -330,9 +330,11 @@ code or new licensing patterns.
             <exclude>config/python.m4</exclude>
             <exclude>config/tcl.m4</exclude>
 
-            <!-- GPLv2-AUTOEXC -->
+            <!-- GPLv2-or-later with the Autoconf exception -->
             <exclude>config/pkg.m4</exclude>
             <exclude>config/libtool.m4</exclude>
+
+            <!-- GPLv3-or-later with the Autoconf Macro exception -->
             <exclude>config/ax_pthread.m4</exclude>
 
             <exclude>.abi-check/**</exclude>
@@ -2087,6 +2089,7 @@ code or new licensing patterns.
               <licenseFamilyName>Apache License (Broadcom-derived)</licenseFamilyName>
               <licenseFamilyCategory>BRDC</licenseFamilyCategory>
               <patterns>
+                <!-- ORCA files Greenplum added in 2024, after Broadcom acquired VMware. -->
                 <pattern>Copyright (C) 2024 VMware by Broadcom.</pattern>
                 <pattern>Copyright (C) 2024 Broadcom</pattern>
               </patterns>
@@ -2119,6 +2122,7 @@ code or new licensing patterns.
                 <pattern>Copyright (c) 2007 Greenplum Inc</pattern>
                 <pattern>Copyright (c) 2010, Greenplum Software</pattern>
                 <pattern>Copyright (c) Greenplum Inc 2010</pattern>
+                <!-- Metapa was one of the two companies that merged to form Greenplum. -->
                 <pattern>Copyright (c) Metapa 2005. All Rights Reserved.</pattern>
                 <pattern>Copyright Greenplum 2008</pattern>
               </patterns>