diff --git a/ChangeLog b/ChangeLog
index cba5cf8445d..bf5b8398e01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2021-10-26: Version 4.2.0:
+ * General:
+   * Fix: Handle repair point choice better so it doesn't pick less than ideal ones (commit:4a3d528b6c70fd5763ad1ebabf181e2e6fc7f321, #2313)
+   * Add: --loadreplay command line option (commit:19c59750c55d74b15f65ee3551ebd08b5777f32e, #2323)
+ * Graphics:
+   * Add: Update Ultimate Scavengers button image (commit:51c535432c1777e4a002e5d41f9865928734dd17, #2305)
+ * Campaign:
+   * Add: Increase oil drum power in Beta (150) and Gamma (200) (commit:211e0a72a0e886e79651e776384f7fe64c5c2a28, #2310)
+   * Fix: Fix fastplay video not working since 4.2.0-beta2 (commit:55b656f1a9c660a5a521a35f2e5de28b41e85824, #2311)
+   * Fix: Prevent old transporter issue on Beta-end where it can come back and fail the player due to little time left to send it away again (commit:2dab78359b0ca05157c73b52d13aa160108c8ce3, #2317)
+ * Scripting:
+   * Change: Update JS documents (commit:1b50d7040c70e4b5c4bab6a1e21f27c58dd4d1f6, #2290)
+ * Multiplayer:
+   * Change: Display team chooser column at all times (commit:8a6b20424d55e5acac0271ef56d82a7cc157c25f, #2302)
+   * Change: Make inactivityMinutes / idleTime configurable (too many commits, #2307)
+   * Fix: Fix a desync in replays due to structure limits not being the same in the replay (commit:79f1580e36b96584616a94d680b7eb09325d9e94, commit:d8f3f8cdcf1550e9680658fc3ff070e640c66b08 commit:c317fc92036952e3bffa90cc7819ce8b1be7e99c, #2288)
+   * Fix: Fix a crash/assert when players were transitioned to spectators (commit:0720478249555a965a1c117d9148816aa6ce4ccf, commit:844afd747987c525c5bfc7e12ad5fd394f426c00, #2293)
+   * Fix: Fix order of players in specstats window (commit:d7ce7f65234011c17f791cad03bca2681d7c5136, #2299)
+   * Fix: Crash on autogame with spectator host (commit:eeb74a0c83be8de18f7645e4f7f5accb763a9a5b, commit:a1d025bd4b6d8cc846eb9f8cb908f97145405e9a, #2323)
+   * Fix: Joining new game after quitting lobby with spectator host (commit:e5e5b3cea4252fd602e0877f251ca373eace39a0, #2323)
+   * Fix: Client sends invalid command to host if autorating URL is enabled (commit:b42006c4295a70554d4c61e53e567a43721c754f, #2323)
+   * Fix: Spectator host autorating URL requests for all clients (commit:9ad707ba27c39aea19e73957a36a9b4e89d5c6dd, #2323)
+   * Fix: Unable to refresh lobby after being kicked (commit:d0b29ee4d0adbd923fb23eae5b4c535998c2f7d1, #2323)
+   * Fix: Replay desync at start due to replay spectator (commit:41142f9dc15dbc139d1155335819c559e73a717d, #2323)
+ * MP-Balance:
+   * Change: Reduced effectiveness of all-rounder weapons against cyborgs to 60% from 65% and make HMG come earlier (commit:37fba9ff657d29ad9e044b447cd1c2063cbb0c35, #2306)
+   * Change: Slightly increase Super Auto-Cannon Cyborgs damage (commit:c8664187f722e2af756a4da7670248c0c7caac68, #2324)
+ * Other:
+   * Fix: Mingw / Clang compile warning fixes (commit:4a4106d59d1ca54938fdc64fb24934b75e38fc86, commit:495ec740a314894aae325c69e9923a11c617edb3, #2291)
+   * Fix: Fix a potential chat related crash (commit:86ea2a27214fb47cbb55fd40af07ec9dd388bf98, #2294)
+   * Fix: Fix potential crash due to 0-sized decals VBO on maps without decals (commit:641b57f61eebb1b860e63eb382b96811ebb72ed2, #2303)
+   * Fix: Crash if transporter is recycled (commit:33bf6b41dab41a583202588aa3aa45897eec5021, #2308)
+   * Fix: Suppress and log wzDisplayDialog in headless mode (commit:aa91f8ef280c52b01a90ccf0149a5f014f544a52, #2323)
+   * Fix: wzapi::gameOverMessage: Trigger a graceful shutdown in autogame / headless mode (commit:3891ec232e85537b71164c8bf838b1f92ba0a84a, #2323)
+
 2021-10-16: Version 4.2.0-beta2:
  * General:
    * Add: Make selected structures and units blink on radar (too many commits, #2260)