diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c178a4..eed8b85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,8 @@ Fixes:
 * st-util: wrong register values passed to gdb (st-link v2) ([#1002](https://github.com/stlink-org/stlink/pull/1002), [#1011](https://github.com/stlink-org/stlink/pull/1011), [#1026](https://github.com/stlink-org/stlink/pull/1026), [#1027](https://github.com/stlink-org/stlink/pull/1027))
 * [doc] Fixed wrong path for rules.d folder ([#1020](https://github.com/stlink-org/stlink/pull/1020))
 * Use vl flashloader for all STM32F1 series ([#1041](https://github.com/stlink-org/stlink/pull/1041), [#1044](https://github.com/stlink-org/stlink/pull/1044))
+* Fixed gettimeofday for MSVC ([#1074](https://github.com/stlink-org/stlink/pull/1074))
+* Fixed compilation with GCC 11 ([#1077](https://github.com/stlink-org/stlink/pull/1077))
 
 
 v1.6.1
diff --git a/README.md b/README.md
index 350c36e..6bb99b8 100644
--- a/README.md
+++ b/README.md
@@ -42,11 +42,11 @@ On the user level there is no difference in handling or operation between these
 
 The STlink toolset includes:
 
-* a communication library (libstlink.a),
-* a programmer and chip information tool (st-info),
-* a flash manipulation tool (st-flash),
-* a GDB server (st-util) and
-* a GUI-Interface (stlink-gui) _[optional]_
+* `libstlink` - a communication library
+* `st-info` - a programmer and chip information tool
+* `st-flash` - a flash manipulation tool
+* `st-util` - a GDB server (supported in Visual Studio Code / VSCodium via the [Cortex-Debug](https://github.com/Marus/cortex-debug) plugin
+* `stlink-gui` - a GUI-Interface [optional]_
 
 
 ## Supported operating systems and hardware combinations
@@ -58,6 +58,7 @@ Supported operating systems are listed in [version_support.md](doc/version_suppo
 The `stlink` toolset continues to maintain backwards compatibility with the **STLINK/v1** programmer.<br />
 Please note that on macOS this support is limited to versions 10.13 - 10.15.
 
+
 ## Tutorial & HOWTO
 
 Our [tutorial](doc/tutorial.md) may help you along with some advanced tasks and additional info.
diff --git a/contributors.txt b/contributors.txt
index 65b53ae..57801b9 100644
--- a/contributors.txt
+++ b/contributors.txt
@@ -64,6 +64,7 @@ Jim Paris
 Jiří Netolický
 Jerry Nosky [jnosky]
 Jochen Wilhelmy [Jochen0x90h]
+John Hall [simplerobot]
 Joel Bodenmann [Tectu]
 Johannes Taelman
 Jonas Danielsson
diff --git a/src/st-util/gdb-server.c b/src/st-util/gdb-server.c
index c47a3a9..4177cef 100644
--- a/src/st-util/gdb-server.c
+++ b/src/st-util/gdb-server.c
@@ -43,7 +43,7 @@
 static stlink_t *connected_stlink = NULL;
 static bool semihosting = false;
 static bool serial_specified = false;
-static char serialnumber[28] = {0};
+static char serialnumber[STLINK_SERIAL_MAX_SIZE] = {0};
 
 #if defined(_WIN32)
 #define close_socket win32_close_socket