diff --git a/README.md b/README.md
index a2c718c..3f35e9c 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 
 # ObjectBox Generator
 
-Current version: 4.0.0-beta
+Current version: 4.0.0
 
 ObjectBox is a superfast cross-platform object-oriented database.
 ObjectBox Generator produces code for ObjectBox C, C++ and Go APIs (more languages to be supported in the future).
@@ -36,9 +36,10 @@ Build notes:
 To get started, have a look at the specific language bindings (the approaches differ):
 
 * C and C++ [repository](https://github.com/objectbox/objectbox-c) and [docs](https://cpp.objectbox.io/).
-  In summary, you define a FlatBuffers schema file, and the ObjectBox Generator will create plain C++ data classes
-  and helper classes that "glue" the data classes to the ObjectBox runtime library.
-  CMake users can also use the convenient add_obx_schema() task instead of using the generator executable directly.
+  * CMake users use `add_obx_schema()` task to configure and invoke the generator at build time.
+  * Non-CMake users can run the generator directly.
+    In summary, you define a FlatBuffers schema file, and the ObjectBox Generator will create plain C++ data classes
+    and helper classes that "glue" the data classes to the ObjectBox runtime library.
 * Go [repository](https://github.com/objectbox/objectbox-go) and [docs](https://golang.objectbox.io/).
   Here, you start with Go data structs, for which the Generator generates the glue code directly.
 
diff --git a/cmake/FindObjectBoxGenerator.cmake b/cmake/FindObjectBoxGenerator.cmake
index e155fa3..ceea362 100644
--- a/cmake/FindObjectBoxGenerator.cmake
+++ b/cmake/FindObjectBoxGenerator.cmake
@@ -128,7 +128,7 @@ Generated headers and sources are written to the sub-directories ``ObjectBoxGene
 option(OBX_GENERATOR_ALLOW_FETCH "Opt-in automatic download and prepare for local execution" ON)
 
 # Updated by maintainer to latest available version:
-set(ObjectBoxGenerator_FETCH_VERSION 4.0.0-beta) # Note: must be safe for filename
+set(ObjectBoxGenerator_FETCH_VERSION 4.0.0) # Note: must be safe for filename
 # Using the version in the directories used for the generator executable to cleanly support multiple versions.
 # This is e.g. relevant when updating to ensure fetching the new version.
 set(ObjectBoxGenerator_FETCH_DIR ${CMAKE_BINARY_DIR}/ObjectBoxGenerator-download/${ObjectBoxGenerator_FETCH_VERSION}/fetch)
diff --git a/internal/generator/generator.go b/internal/generator/generator.go
index 0f74593..81b3abd 100644
--- a/internal/generator/generator.go
+++ b/internal/generator/generator.go
@@ -35,7 +35,7 @@ import (
 )
 
 // Version specifies the current generator version.
-const Version = "4.0.0-beta"
+const Version = "4.0.0"
 
 // VersionId specifies the current generator version identifier.
 // It is used to validate generated code compatibility and is increased when there are changes in the generated code.