diff --git a/CHANGES.md b/CHANGES.md
index 8dbf629..e01289c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,33 @@
 -->
 # PHOENIX Changelog
 
+## Release thirdparty-2.0.0 - Unreleased (as of 2022-03-28)
+
+
+
+### IMPROVEMENTS:
+
+| JIRA | Summary | Priority | Component |
+|:---- |:---- | :--- |:---- |
+| [PHOENIX-6575](https://issues.apache.org/jira/browse/PHOENIX-6575) | Replace patched commons-cli with original one when a release with CLI-254 is available |  Major | thirdparty |
+| [PHOENIX-6641](https://issues.apache.org/jira/browse/PHOENIX-6641) | Bump Guava to 31.0.1 in phoenix-thirdparty |  Major | thirdparty |
+
+
+### BUG FIXES:
+
+| JIRA | Summary | Priority | Component |
+|:---- |:---- | :--- |:---- |
+| [PHOENIX-6353](https://issues.apache.org/jira/browse/PHOENIX-6353) | Fix phoenix-thirdparty rat warnings, and update CHANGES.md, RELEASE\_NOTES.md |  Minor | thirdparty |
+
+
+### OTHER:
+
+| JIRA | Summary | Priority | Component |
+|:---- |:---- | :--- |:---- |
+| [PHOENIX-6648](https://issues.apache.org/jira/browse/PHOENIX-6648) | Change next release version of phoenix-thirdparty to 2.0.0 |  Major | thirdparty |
+
+
+
 ## Release thirdparty-1.1.0 - Unreleased (as of 2021-01-29)
 
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 885d1ae..19ab0f4 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -16,6 +16,28 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 -->
+# PHOENIX  thirdparty-2.0.0 Release Notes
+
+These release notes cover new developer and user-facing incompatibilities, important issues, features, and major improvements.
+
+
+---
+
+* [PHOENIX-6575](https://issues.apache.org/jira/browse/PHOENIX-6575) | *Major* | **Replace patched commons-cli with original one when a release with CLI-254 is available**
+
+Phoenix-thirdparty now uses unmodified (apart from the relocation) upstream commons-cli 1.5.0.
+commons-cli 1.5.0 includes the fix for CLI-254, bu the API to activate it is different than the patched version included in phoenix-thirdparty 1.1.0.
+Hence phoenix-thirdparty is 2.0 NOT API compatible with phoenix-thirdparty 1.1.0
+
+
+---
+
+* [PHOENIX-6641](https://issues.apache.org/jira/browse/PHOENIX-6641) | *Major* | **Bump Guava to 31.0.1 in phoenix-thirdparty**
+
+Phoenix-thirdparty now includes Guava 31.0.1.
+
+
+
 
 
 # PHOENIX  thirdparty-1.1.0 Release Notes
diff --git a/phoenix-shaded-commons-cli/pom.xml b/phoenix-shaded-commons-cli/pom.xml
index 955e861..da0c824 100644
--- a/phoenix-shaded-commons-cli/pom.xml
+++ b/phoenix-shaded-commons-cli/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.phoenix.thirdparty</groupId>
     <artifactId>phoenix-thirdparty</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
   <artifactId>phoenix-shaded-commons-cli</artifactId>
   <name>Apache Phoenix Patched and Relocated (Shaded) Commons-CLI</name>
diff --git a/phoenix-shaded-guava/pom.xml b/phoenix-shaded-guava/pom.xml
index 1ba56ee..a023f89 100644
--- a/phoenix-shaded-guava/pom.xml
+++ b/phoenix-shaded-guava/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.phoenix.thirdparty</groupId>
     <artifactId>phoenix-thirdparty</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <artifactId>phoenix-shaded-guava</artifactId>
diff --git a/pom.xml b/pom.xml
index b0efdf8..645afdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
   <groupId>org.apache.phoenix.thirdparty</groupId>
   <artifactId>phoenix-thirdparty</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>2.0.0</version>
   <packaging>pom</packaging>
   <name>Apache Phoenix Third-Party Libs</name>
   <description>Packaging of relocated (renamed, shaded) third-party libraries used by Phoenix.</description>