diff --git a/CHANGES.txt b/CHANGES.txt
index 405bd4961b8..6589b7e498d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,10 +1,12 @@
-
-Unreleased Changes (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
+2021-05-07 version 3.17.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
 
   Protocol Compiler
   * Fix the generated source information for reserved values in Enums.
 
   C++
+  * Fix -Wunused-parameter in map<string, int> fields (fixes #8494) (#8500)
+  * Use byteswap.h when building against musl libc (#8503)
+  * Fix -Wundefined-inline error when using SharedCtor() or SharedDtor() (#8532)
   * Fix bug where `Descriptor::DebugString()` printed proto3 synthetic oneofs.
   * Provide stable versions of `SortAndUnique()`.
   * Make sure to cache proto3 optional message fields when they are cleared.
@@ -15,6 +17,7 @@ Unreleased Changes (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
   * Restrict extension setter and getter operators to non-nullable T.
 
   Java
+  * updating GSON and Guava to more recent versions (#8524)
   * Reduce the time spent evaluating isExtensionNumber by storing the extension
     ranges in a TreeMap for faster queries. This is particularly relevant for
     protos which define a large number of extension ranges, for example when
@@ -23,13 +26,28 @@ Unreleased Changes (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
   * Optimize Descriptor.isExtensionNumber.
 
   Python
+  * [python-runtime] Add MethodDescriptor.CopyToProto() (#8327)
+  * Remove unused python_protobuf.{cc,h} (#8513)
+  * Start publishing python aarch64 manylinux wheels normally (#8530)
+  * Fix constness issue detected by MSVC standard conforming mode (#8568)
   * Make JSON parsing match C++ and Java when multiple fields from the same
     oneof are present and all but one is null.
 
+  Ruby
+  * Ruby: Add support for proto3 json_name in compiler and field definitions (#8356)
+  * Fixed memory leak of Ruby arena objects. (#8461)
+  * Fix source gem compilation (#8471)
+  * fix(ruby): Fix various exceptions in Ruby on 64-bit Windows (#8563)
+  * fix(ruby): Fix crash when calculating Message hash values on 64-bit Windows (#8565)
+
   Conformance Tests
   * Added a conformance test for the case of multiple fields from the same
     oneof.
 
+  Other
+  * Opensourcing kotlin protos (#8272)
+  * Use a newer version of rules_proto, with the new rule `proto_descriptor_set` (#8469)
+
 3.16.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
 
   C++
diff --git a/php/ext/google/protobuf/package.xml b/php/ext/google/protobuf/package.xml
index 1a585c6be35..e612885e8eb 100644
--- a/php/ext/google/protobuf/package.xml
+++ b/php/ext/google/protobuf/package.xml
@@ -22,7 +22,7 @@
  </stability>
  <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
  <notes>
- No new changes in 3.15.8
+ No new changes in 3.17.0
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">