@@ -244,7 +244,9 @@ The PostgreSQL software includes:
       Code from the BSD C library, each file under its own University of
       California copyright notice and the 3-clause BSD terms (in some
       files the rescinded advertising clause is left as a numbered gap):
+      src/include/getopt_long.h
       src/include/lib/sort_template.h
+      src/include/pg_getopt.h
       src/port/bsearch_arg.c
       src/port/fls.c
       src/port/getopt.c
@@ -341,6 +343,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
 
 ----------------------------
@@ -480,10 +483,20 @@ Copyright (c) 2004-2020 VMware, Inc. or its affiliates. All Rights Reserved.
 
 All Rights Reserved.
 
-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
+an older "Copyright (c) Metapa 2005" notice; Metapa merged with Didera in
+2003 to form Greenplum:
+
+   gpMgmt/bin/gpinitsystem
+   gpMgmt/bin/lib/gp_bash_functions.sh
+   gpMgmt/bin/lib/gpcreateseg.sh
+
+All of these files are part of Greenplum Database and are covered by the
+same license.
 
 Greenplum Database is licensed under the Apache License Version 2.0
 (see LICENSE) and is based on the PostgreSQL Database Management System.
@@ -513,6 +526,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 +561,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 +712,72 @@ 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 under config/
+
+These files 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, and the
+generated configure script includes expansions of these macros.
+
+----------------------------
+   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
+
+      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)
@@ -31,6 +31,7 @@ This file is licensed under the GPL (Category X) and has been removed from the s
 
 The following entities have contributed to the Greenplum-based source code under the Apache License 2.0:
 
+- Metapa (merged with Didera in 2003 to form Greenplum)
 - Greenplum, Inc.
 - EMC Corporation
 - VMware, Inc.
 
@@ -2087,6 +2087,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 +2120,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 merged with Didera in 2003 to form Greenplum. -->
                 <pattern>Copyright (c) Metapa 2005. All Rights Reserved.</pattern>
                 <pattern>Copyright Greenplum 2008</pattern>
               </patterns>