diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54513ccda..df91a0008 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,57 @@
 # Changelog
 
+## [7.0.0](https://github.com/avmi/protobuf.js/compare/v6.8.8...v7.0.0) (2022-06-08)
+
+
+### ⚠ BREAKING CHANGES
+
+* move command line tool to a new package named protobufjs-cli (#1234)
+* encoding of empty Buffers (#1514)
+
+### Features
+
+* add --no-service option for pbjs static target ([#1577](https://github.com/avmi/protobuf.js/issues/1577)) ([d01394a](https://github.com/avmi/protobuf.js/commit/d01394a1463062824c066b653aad53c449752202))
+* add configurable Root.prototype.fetch ([ad3cffd](https://github.com/avmi/protobuf.js/commit/ad3cffdc5a54a7c94830674270d3386e1a2b58fc))
+* add getTypeUrl method to generated code ([#1463](https://github.com/avmi/protobuf.js/issues/1463)) ([d13d5d5](https://github.com/avmi/protobuf.js/commit/d13d5d5688052e366aa2e9169f50dfca376b32cf))
+* add null-defaults option ([#1611](https://github.com/avmi/protobuf.js/issues/1611)) ([6e713ba](https://github.com/avmi/protobuf.js/commit/6e713baf54bd987ae52cbf92a4f2742c70201dc0))
+* add support for buffer configuration ([#1372](https://github.com/avmi/protobuf.js/issues/1372)) ([101aa1a](https://github.com/avmi/protobuf.js/commit/101aa1a4f148516fdc83a74f54a229f06e24a5de))
+* better comment parse ([#1419](https://github.com/avmi/protobuf.js/issues/1419)) ([7fd2e18](https://github.com/avmi/protobuf.js/commit/7fd2e182150c9b6be9ba21e6450b6e4668ad9f82))
+* move command line tool to a new package named protobufjs-cli ([#1234](https://github.com/avmi/protobuf.js/issues/1234)) ([da34f43](https://github.com/avmi/protobuf.js/commit/da34f43ccd51ad97017e139f137521782f5ef119))
+* parsed options ([#1256](https://github.com/avmi/protobuf.js/issues/1256)) ([7a25398](https://github.com/avmi/protobuf.js/commit/7a2539843055b6daecb9f369c67a6cf588dbb54c))
+* proto3 optional support ([#1584](https://github.com/avmi/protobuf.js/issues/1584)) ([6c4d307](https://github.com/avmi/protobuf.js/commit/6c4d30716a9a756dcdc21d64f9c9d069315fc5b1))
+* update dependencies / general cleanup ([#1356](https://github.com/avmi/protobuf.js/issues/1356)) ([42f49b4](https://github.com/avmi/protobuf.js/commit/42f49b43f692c24c2bc1ae081b4d1ad9fa173cd7))
+
+
+### Bug Fixes
+
+* allow file-level options everywhere in the file ([b70eebd](https://github.com/avmi/protobuf.js/commit/b70eebd86e113effaa7d13b24b19ee4a0cb9e1e5))
+* allow for an optional semicolon where there is an optional comma in parseOptionValue ([#1571](https://github.com/avmi/protobuf.js/issues/1571)) ([af1b449](https://github.com/avmi/protobuf.js/commit/af1b449602b360091e191a58abde2f246d8b0f1d))
+* allow Windows unc paths to be resolved and normalized ([#1351](https://github.com/avmi/protobuf.js/issues/1351)) ([cd4aeda](https://github.com/avmi/protobuf.js/commit/cd4aeda8036f80cfa3b9f1db4096d856b2fd05fb))
+* **deps:** patch minimatch vulnerability ([#1704](https://github.com/avmi/protobuf.js/issues/1704)) ([bac61b8](https://github.com/avmi/protobuf.js/commit/bac61b8c2757804bbb9c5fa0f8bc6a7bcf0bb374))
+* **deps:** use eslint 8.x ([#1728](https://github.com/avmi/protobuf.js/issues/1728)) ([fa01883](https://github.com/avmi/protobuf.js/commit/fa01883a0f756824d69ce92bfb012de05ff223ef))
+* do not fail if no process ([#1440](https://github.com/avmi/protobuf.js/issues/1440)) ([f2faa8c](https://github.com/avmi/protobuf.js/commit/f2faa8c32e918b3b843005f0419608b8e158998d))
+* do not let setProperty change the prototype ([#1731](https://github.com/avmi/protobuf.js/issues/1731)) ([3357ef7](https://github.com/avmi/protobuf.js/commit/3357ef753871b394b825d15429ceb27b26e24d63))
+* **docs:** update CHANGELOG to match format of release-please ([#1376](https://github.com/avmi/protobuf.js/issues/1376)) ([15ed8a0](https://github.com/avmi/protobuf.js/commit/15ed8a0fbe72b2e408b87ba25028f877796cc191))
+* encoding of empty Buffers ([#1514](https://github.com/avmi/protobuf.js/issues/1514)) ([b4cae07](https://github.com/avmi/protobuf.js/commit/b4cae07440387399e097058e15e50608a0e764fd)), closes [#1500](https://github.com/avmi/protobuf.js/issues/1500) [#885](https://github.com/avmi/protobuf.js/issues/885)
+* es6 export enum ([#1446](https://github.com/avmi/protobuf.js/issues/1446)) ([9f33784](https://github.com/avmi/protobuf.js/commit/9f33784350b1efc2e774bbfc087cbd2c47828748))
+* fix util.global ([#1441](https://github.com/avmi/protobuf.js/issues/1441)) ([742b8dc](https://github.com/avmi/protobuf.js/commit/742b8dcbc750f9c2659088cbd88ea61fd11b24a7))
+* fromObject should not initialize oneof members ([#1597](https://github.com/avmi/protobuf.js/issues/1597)) ([90afe44](https://github.com/avmi/protobuf.js/commit/90afe4412de8070b0c0681e5905a6e0213072a85))
+* google.protobuf.Any type_url fixes ([#1068](https://github.com/avmi/protobuf.js/issues/1068)) ([192f5f1](https://github.com/avmi/protobuf.js/commit/192f5f12d071fa534ac625290d4666c839a46a9e))
+* handling of map entries with omitted key or value ([#1348](https://github.com/avmi/protobuf.js/issues/1348)) ([b950877](https://github.com/avmi/protobuf.js/commit/b950877c86676399674821fca4cf444f046b5acb))
+* handling properly fields with leading and trailing comments after field with trailing comment ([#1593](https://github.com/avmi/protobuf.js/issues/1593)) ([9011aac](https://github.com/avmi/protobuf.js/commit/9011aac161e1bf8eaa3cbf0f17e8f321b6e0d9c4))
+* Import Long types ([1d98cb8](https://github.com/avmi/protobuf.js/commit/1d98cb86fcbc69bd54fb3d3254b348da6ac0a96b))
+* Import Long types ([8a85863](https://github.com/avmi/protobuf.js/commit/8a858634f3add3a2d8567f72699b907e9f543eca))
+* make node detection a bit more forgiving ([#1445](https://github.com/avmi/protobuf.js/issues/1445)) ([4e75f6d](https://github.com/avmi/protobuf.js/commit/4e75f6de4a2e49f28c24b59107f262d472b68977))
+* make parsedOptions appear in method JSON representation ([#1506](https://github.com/avmi/protobuf.js/issues/1506)) ([3d29969](https://github.com/avmi/protobuf.js/commit/3d29969865f2119550d9dc88391846469da9fa7f))
+* npm audit fixes ([ca52447](https://github.com/avmi/protobuf.js/commit/ca524478621bd2e08120eb444c7ad8089dba1929))
+* properly iterate and return method descriptors ([d96bb7a](https://github.com/avmi/protobuf.js/commit/d96bb7ae991ca7d5ef8eea3bca75a2089c6f1212))
+* properly parse empty messages in options ([#1429](https://github.com/avmi/protobuf.js/issues/1429)) ([7fbc79f](https://github.com/avmi/protobuf.js/commit/7fbc79f11d89b263dafc8f332ccba59a8d181fca))
+* run npm audit fix ([#1208](https://github.com/avmi/protobuf.js/issues/1208)) ([b5b6632](https://github.com/avmi/protobuf.js/commit/b5b66321762a24c5ac2753b68331cbe115969da7))
+* support for options with `repeated_value: [ "foo", "bar" ]` ([#1574](https://github.com/avmi/protobuf.js/issues/1574)) ([f5b893c](https://github.com/avmi/protobuf.js/commit/f5b893c03e9694bbe7da7c4001cc74b06039eb9c))
+* typo in pbjs help text ([#1552](https://github.com/avmi/protobuf.js/issues/1552)) ([7f46dbe](https://github.com/avmi/protobuf.js/commit/7f46dbeb538a6277035a896e1ab5e1a070e28681))
+* updated isNode check ([#1221](https://github.com/avmi/protobuf.js/issues/1221)) ([#1363](https://github.com/avmi/protobuf.js/issues/1363)) ([5564e7b](https://github.com/avmi/protobuf.js/commit/5564e7b5f07d3eab99762528e8ce88507af5a5a3))
+* utf8 -> utf16 decoding bug on surrogate pairs ([#1486](https://github.com/avmi/protobuf.js/issues/1486)) ([75172cd](https://github.com/avmi/protobuf.js/commit/75172cd11be137bbabd2fba7a02b15067695ebad))
+
 ### [6.10.2](https://www.github.com/protobufjs/protobuf.js/compare/v6.10.1...v6.10.2) (2020-11-13)
 
 
diff --git a/package-lock.json b/package-lock.json
index c069f1c75..48edacd9c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "protobufjs",
-  "version": "6.10.2",
+  "version": "7.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "protobufjs",
-      "version": "6.10.2",
+      "version": "7.0.0",
       "hasInstallScript": true,
       "license": "BSD-3-Clause",
       "dependencies": {
diff --git a/package.json b/package.json
index 4f53ee32a..74dbdfd8c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "protobufjs",
-  "version": "6.10.2",
+  "version": "7.0.0",
   "versionScheme": "~",
   "description": "Protocol Buffers for JavaScript (& TypeScript).",
   "author": "Daniel Wirtz <dcode+protobufjs@dcode.io>",