Update changelog and authors
diff --git a/AUTHORS.txt b/AUTHORS.txt
index d966e4c..c079cb0 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -63,9 +63,7 @@
 Adam Klama <klama.adam@gmail.com>
 Anton Matosov <amatosov@roblox.com>
 berni155 <bdkrae@gmail.com>
-bolind <bolind@users.noreply.github.com>
 David Lin <dtwlin@google.com>
-dch <david.hotham@blueyonder.co.uk>
 devjoa <devjoa@gmail.com>
 Evan Fisher <schleb@gmail.com>
 Fay <fay2003hiend@gmail.com>
@@ -100,7 +98,7 @@
 Matthew Simmons <simmonmt@acm.org>
 Anthony Pesch <inolen@gmail.com>
 Avik De <avikde@gmail.com>
-ConradWood <github@conradwood.net>
+Conrad Wood <github@conradwood.net>
 David Sabatie <david.sabatie@notrenet.com>
 Sebastian Stockhammer <sebastian.stockhammer@rosenberger.de>
 Gil Shapira <gil.shapira@intusurg.com>
@@ -114,3 +112,12 @@
 Pavel Sokolov <pavel@sokolov.me>
 Slavey Karadzhov <slav@attachix.com>
 Tobias Nießen <tniessen@tnie.de>
+Christian Balcom <robot.inventor@gmail.com>
+Christopher Hughes <67643395+chughes-pika@users.noreply.github.com>
+Greg Balke <gbalke@berkeley.edu>
+Jussi Keränen <jussike@gmail.com>
+Krzysztof Rosinski <krzysiek@jrdltd.co.uk>
+Nathaniel Brough <nathaniel.brough@gmail.com>
+Sean Kahler <itsbattledash@gmail.com>
+Valerii Koval <valeros@users.noreply.github.com>
+Gediminas Žukaitis <gediminas.zukaitis@protonmail.com>
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 51182f6..f57c5e8 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,31 @@
+nanopb-0.4.7 (2022-12-xx)
+ Fix comments generation for submessages (#788)
+ Fix handling of spaces in arguments passed through protoc (#810)
+ Fix problems with multiple files and mangle_names option (#783, #820)
+ Fix generator error when using M_STRIP_PACKAGE without package name (#795)
+ Fix compilation error with fixed size array and FT_POINTER (#630)
+ Fix wrong format in Python Poetry project file (#811)
+ Fix unnecessary generator message when using --quiet (#831)
+ Fix enum_to_string with C++ (#838)
+ Fix /* */ inside .proto file comment
+ Workaround python-protobuf version issues (#787)
+ Safeguard substraction in pb_read() with custom streams (#697)
+ Always include pb_release() as function, instead of macro. (#802)
+ Allow using = instead of : with generator option -s
+ Allow specifying include format without special characters (#810)
+ Allow including headers from inside of extern C (#814)
+ Add option NANOPB_PB2_TEMP_DIR to store nanopb_pb2.py in a temporary dir (#601)
+ Add compile-time error message for when PB_FIELD_32BIT is needed (#680, #827)
+ Add --c-style command line option for naming style (#199, #533, #791)
+ Add --protoc-opt to nanopb_generator.py (#628)
+ Add ENUMTYPE convenience macros (#803)
+ Add Bazel build rules (#360, #500)
+ Generator: keep order of messages when possible
+ Test case improvements (#792)
+ PlatformIO build rule improvements (#808, #809, #819, #834, #839, #840)
+ CMake build rule improvements (#822)
+ CMakeLists: use protoc wrapper script by default (#769)
+
 nanopb-0.4.6 (2022-05-30)
  Fix passing of error message from substream callback (#703)
  Fix comments going to wrong member variables (#701)