diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4ecdc47..51182f6 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -34,11 +34,10 @@
  Improve handling of varint overflows
  Improve optimization for little-endian platforms
 
-NOTE: During development, prereleases were published on platform.io registry
-as versions 0.4.6 - 0.4.6.3. The version 0.4.6.4 on platform.io corresponds
+NOTE: During development, prereleases were published on PlatformIO registry
+as versions 0.4.6 - 0.4.6.3. The version 0.4.6.4 on PlatformIO corresponds
 to the real final 0.4.6 release.
 
-
 nanopb-0.4.5 (2021-03-22)
  Fix invalid free() with oneof (#647, GHSA-7mv5-5mxh-qg88)
  Fix unordered field numbers inside oneof causing fields to be ignored (#617)
@@ -190,6 +189,13 @@
  CMake: Split nanopb_out command (#454)
  CMake: install created shared library(dll) in windows to the binary folder (#447)
 
+nanopb-0.3.9.9 (2022-04-23)
+ Fix Xcode analyzer warnings (#667, #674)
+ Fix clang sanitizer warnings
+
+Note: there are no known functional differences between 0.3.9.8 and 0.3.9.9.
+The changes are merely to fix warnings introduced by new compiler versions.
+
 nanopb-0.3.9.8 (2021-03-22)
  Fix invalid free() with oneof (#647, GHSA-7mv5-5mxh-qg88)
  Don't generate lines with trailing spaces (#622)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f509a91..b7f43c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 project(nanopb C)
 
-set(nanopb_VERSION_STRING nanopb-0.4.6)
+set(nanopb_VERSION_STRING nanopb-0.4.7-dev)
 set(nanopb_SOVERSION 0)
 
 string(REPLACE "nanopb-" "" nanopb_VERSION ${nanopb_VERSION_STRING})
diff --git a/conanfile.py b/conanfile.py
index 93211f2..d2ad1b2 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -3,7 +3,7 @@
 
 class NanoPbConan(ConanFile):
     name = "nanopb"
-    version = "0.4.6"
+    version = "0.4.7-dev"
     license = "zlib"
     url = "https://jpa.kapsi.fi/nanopb/"
     description = "Protocol Buffers with small code size"
diff --git a/extra/poetry/pyproject.toml b/extra/poetry/pyproject.toml
index 4ef1903..c9858ce 100644
--- a/extra/poetry/pyproject.toml
+++ b/extra/poetry/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nanopb"
-version = "0.4.6"
+version = "0.4.7-dev"
 description = "Nanopb is a small code-size Protocol Buffers implementation in ansi C. It is especially suitable for use in microcontrollers, but fits any memory restricted system."
 authors = ["Petteri Aimonen <jpa@npb.mail.kapsi.fi>"]
 license = "Zlib"
diff --git a/generator/nanopb_generator.py b/generator/nanopb_generator.py
index 819b993..b7cddde 100755
--- a/generator/nanopb_generator.py
+++ b/generator/nanopb_generator.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 
 '''Generate header file for nanopb from a ProtoBuf FileDescriptorSet.'''
-nanopb_version = "nanopb-0.4.6"
+nanopb_version = "nanopb-0.4.7-dev"
 
 import sys
 import re
diff --git a/pb.h b/pb.h
index f5c9c6f..a1d7057 100644
--- a/pb.h
+++ b/pb.h
@@ -65,7 +65,7 @@
 
 /* Version of the nanopb library. Just in case you want to check it in
  * your own program. */
-#define NANOPB_VERSION "nanopb-0.4.6"
+#define NANOPB_VERSION "nanopb-0.4.7-dev"
 
 /* Include all the system headers needed by nanopb. You will need the
  * definitions of the following: