diff --git a/NOTICE b/NOTICE
index b9087b99e90b..7761a54db9f0 100644
--- a/NOTICE
+++ b/NOTICE
@@ -86,6 +86,14 @@ Copyright 2011-2017 Metamarkets Group Inc.
 extendedset
 Copyright 2012 Metamarkets Group Inc.
 
+================= Apache Commons DBCP2 2.0.1 =================
+
+Apache Commons DBCP
+Copyright 2001-2020 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
+
 -------------------------------------------------------------------------------
 
 This library contains a modified version of Alessandro Colantonio's CONCISE
diff --git a/licenses.yaml b/licenses.yaml
index 15ef2014e328..9bf7ca121f84 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -148,7 +148,7 @@ source_paths:
 ---
 
 name: AWS RDS SDK for Java
-license_category: source
+license_category: binary
 module: extensions/druid-aws-rds-extensions
 license_name: Apache License version 2.0
 version: 1.11.884
@@ -157,6 +157,22 @@ libraries:
 
 ---
 
+name: Code adopted from org.apache.commons.dbcp2.BasicDataSource
+license_category: source
+module: server
+license_name: Apache License version 2.0
+version: 2.0.1
+source_paths:
+  - server/src/main/java/org/apache/druid/metadata/BasicDataSourceExt.java
+notice: |
+  Apache Commons DBCP
+  Copyright 2001-2020 The Apache Software Foundation
+
+  This product includes software developed at
+  The Apache Software Foundation (https://www.apache.org/).
+
+---
+
 name: LDAP string encoding function from OWASP ESAPI
 license_category: source
 module: extensions/druid-basic-security