diff --git a/AUTHORS.txt b/AUTHORS.txt
index 2c603f6..465f107 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -95,4 +95,6 @@
 Melvin Wang <mwang@sibros.tech>
 Tim Gates <tim.gates@iress.com>
 leabut <leabut@users.noreply.github.com>
-
+Angel ILIEV <a.v.iliev13@gmail.com>
+Jakub Tymejczyk <jakub@tymejczyk.pl>
+Matthew Simmons <simmonmt@acm.org>
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 569f6e5..0559646 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,17 @@
+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)
+ Fix pb_decode() not initializing fields inside oneof (#635
+ Fix compiler errors with complex oneof hierarchy and sizeof() (#610)
+ Fix descriptor width calculation for 64-bit types (#644)
+ Fix compiler error in generated initializer for submessage callback (#631)
+ Fix duplicate union definition in generated file (#637)
+ Fix test case build error on SCons 4.1.0
+ Pip package: include nanopb_pb2.py (#629)
+ Make generator consider dependencies recursively (#610)
+ Bazel build system updates (#633)
+ Add support for including comments from .proto file (#85, #645)
+
 nanopb-0.4.4 (2020-11-25)
  Fix memory leak with oneofs and PB_ENABLE_MALLOC (#615, GHSA-85rr-4rh9-hhwh)
  Fix generator error when oneof contains a single unresolved field size (#610)
@@ -135,6 +149,11 @@
  CMake: Split nanopb_out command (#454)
  CMake: install created shared library(dll) in windows to the binary folder (#447)
 
+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)
+ Verify stream size before allocating string / bytes (#620)
+
 nanopb-0.3.9.7 (2020-11-25)
  Fix memory leak with oneofs and PB_ENABLE_MALLOC (#615, GHSA-85rr-4rh9-hhwh)
  Fix unsigned enums not working correctly inside OneOf (#611)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 205af9e..d9c5e5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 project(nanopb C)
 
-set(nanopb_VERSION_STRING nanopb-0.4.5-dev)
+set(nanopb_VERSION_STRING nanopb-0.4.5)
 set(nanopb_SOVERSION 0)
 
 string(REPLACE "nanopb-" "" nanopb_VERSION ${nanopb_VERSION_STRING})
diff --git a/conanfile.py b/conanfile.py
index 2e73e15..fb57883 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -3,7 +3,7 @@
 
 class NanoPbConan(ConanFile):
     name = "nanopb"
-    version = "0.4.5-dev"
+    version = "0.4.5"
     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 dadb5f5..ac0224b 100644
--- a/extra/poetry/pyproject.toml
+++ b/extra/poetry/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nanopb"
-version = "0.4.5-dev"
+version = "0.4.5"
 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 0ddb41a..48792ef 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.5-dev"
+nanopb_version = "nanopb-0.4.5"
 
 import sys
 import re
diff --git a/library.json b/library.json
index 3c819b0..9336458 100644
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "Nanopb",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "keywords": "protocol buffers, protobuf, google",
   "description": "Nanopb is a plain-C implementation of Google's Protocol Buffers data format. It is targeted at 32 bit microcontrollers, but is also fit for other embedded systems with tight (<10 kB ROM, <1 kB RAM) memory constraints.",
   "repository": {
diff --git a/pb.h b/pb.h
index a50d51d..be7c067 100644
--- a/pb.h
+++ b/pb.h
@@ -55,7 +55,7 @@
 
 /* Version of the nanopb library. Just in case you want to check it in
  * your own program. */
-#define NANOPB_VERSION nanopb-0.4.5-dev
+#define NANOPB_VERSION nanopb-0.4.5
 
 /* Include all the system headers needed by nanopb. You will need the
  * definitions of the following: