diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10d81edc7..b3ed98b39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,23 +7,29 @@ The public API of this library consists of the functions declared in file
 
 ## [Unreleased]
 
+## [4.0.0-rc1] - 2022-02-07
+### Breaking changes
+- Rename functions according to the terminology RFC (#571, #403, #466, #495, #466)
+- Functions that can experience errors now have an `H3Error` return value. (#551, #550, #509, #505, #507, #508, #503, #478, #468, #436, #359)
+- Cell count parameters use `int64_t` instead of `int`.
+- `polygonToCells` (previously `polyfill`) accepts a flags argument for future expansion. (#570)
+
 ### Added
-- Vertex mode and associated functions:
+- Vertex mode and associated functions: (#422, #420, #417)
     - `cellToVertex(cell, vertexNum)`
     - `cellToVertexes(cell, out)`
-    - `vertexToPoint(vertex, out)` 
+    - `vertexToLatLng(vertex, out)`
     - `isValidVertex(vertex)` 
-- closed-form implementation of `numHexagons`
+- `h3` CLI application. (#556, #497)
 
-### Breaking changes
-- rename functions according to the terminology RFC (#403, #466)
-- `cellToChildrenSize` to output `int64_t` instead of `int`
-- `pointDistRads` to `distanceRads`
-- `pointDistKm` to `distanceKm`
-- `pointDistM` to `distanceM`
+### Fixed
+- A number of issues detected via unit tests and fuzzers were fixed. (#568, #562, #558, #559, #560, #430)
 
 ### Other changes
-- generally use `lng` instead of `lon`
+- Generally use `lng` instead of `lon`
+- Closed-form implementation of `numHexagons`
+- A number of fuzzer harnesses are now included in the H3 core library. (#557, #553, #545, #433)
+- Additional benchmarks are added and benchmarks are regularly run in CI. (#524, #518)
 
 ## [3.7.2] - 2021-07-15
 ### Fixed
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63b6b5322..17ef1eafc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,8 @@ endif()
 file(READ VERSION H3_VERSION LIMIT_COUNT 1)
 # Clean any newlines
 string(REPLACE "\n" "" H3_VERSION "${H3_VERSION}")
+# Remove any trailing qualifier
+string(REGEX REPLACE "-.*$" "" H3_VERSION "${H3_VERSION}")
 string(REPLACE "." ";" H3_VERSION_LIST "${H3_VERSION}")
 list(GET H3_VERSION_LIST 0 H3_VERSION_MAJOR)
 list(GET H3_VERSION_LIST 1 H3_VERSION_MINOR)
diff --git a/VERSION b/VERSION
index 0b2eb36f5..245b3a2bf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.7.2
+4.0.0-rc1