diff --git a/LICENSE b/LICENSE
index cc431fc18c8..384cb4e7d19 100644
--- a/LICENSE
+++ b/LICENSE
@@ -495,6 +495,21 @@ The Greenplum Database software includes:
 ----------------------------
    Apache License - Version 2.0
 
+      PXF foreign data wrapper client code derived from Apache HAWQ,
+      copyright The Apache Software Foundation:
+      gpcontrib/pxf_fdw/libchurl.c
+      gpcontrib/pxf_fdw/libchurl.h
+      gpcontrib/pxf_fdw/pxf_filter.c
+      gpcontrib/pxf_fdw/pxf_filter.h
+      gpcontrib/pxf_fdw/pxf_fragment.h
+      gpcontrib/pxf_fdw/pxf_header.c
+      (see the Apache License above, and NOTICE)
+      Greenplum Database took this code from HAWQ's PXF external table
+      client (src/backend/access/external and src/include/access in
+      Apache HAWQ) and later reworked it into a foreign data wrapper.
+      pxf_bridge.c, pxf_bridge.h and pxf_header.h in the same directory
+      carry the same Apache License header but share no code with HAWQ.
+
       cmockery unit testing framework, copyright 2008 Google Inc.:
       src/test/unit/cmockery
       (see the Apache License above; also shipped in-tree as
diff --git a/NOTICE b/NOTICE
index 0226ded13da..475ffb11541 100644
--- a/NOTICE
+++ b/NOTICE
@@ -10,3 +10,10 @@ This product includes software originally developed by VMware.
 
 Greenplum Database
 Copyright (c) 2004-2020 VMware, Inc. or its affiliates. All Rights Reserved.
+
+---------------------------------------------------------------------------
+
+This product includes software originally developed by Apache HAWQ.
+
+Apache HAWQ
+Copyright 2017 The Apache Software Foundation