diff --git a/.ottdrev-vc b/.ottdrev-vc
index ee79737070..7c57b16848 100644
--- a/.ottdrev-vc
+++ b/.ottdrev-vc
@@ -1,2 +1,2 @@
-jgrpp-0.39.2	20201229	0	833fa42c3fe9c2875ce5f943cd9a66eeca4f6b2c	1	1	2020
-f8a265ad85ef51cd6e010cd20ba86583eec1cb36e29fa0101dc3365704a1ef58  -
+jgrpp-0.40.0	20210202	0	be216952cb85d845f0091c00871c521519825cc7	1	1	2021
+dc11167c85fa609c67683ec8f2c42376c63f6306fec53fc65d389c15963a93b2  -
diff --git a/README.md b/README.md
index 0bc54de03c..33afe5e7f3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## JGR's Patchpack version 0.39.2
+## JGR's Patchpack version 0.40.0
 
 This is a collection of patches applied to [OpenTTD](http://www.openttd.org/)
 
@@ -221,6 +221,11 @@ See the [wiki](https://github.com/JGRennison/OpenTTD-patches/wiki) for guides on
   * Road vehicles may now start and finish overtaking on bridges and in tunnels.  
   See the [wiki](https://github.com/JGRennison/OpenTTD-patches/wiki/One-way-roads) for full details.
 
+* Realistic train braking (added in v0.40.0)  
+  In this mode, trains have a stopping distance and will reserve ahead accordingly, trains cannot stop instantly.  
+  This mode has many implications for signalling and track layout design, and is therefore an advanced feature which may not be suitable for beginners.  
+  In particular pre-signals and two-way signals are not permitted, and PBS is used for all signalling.
+
 * Save/load and savegame format changes  
   * Various changes to improve handling of savegames which use features not in trunk.  
   * Savegames from this patchpack are not loadable in trunk.  
@@ -285,6 +290,8 @@ See the [wiki](https://github.com/JGRennison/OpenTTD-patches/wiki) for guides on
   * Increase per-vehicle order limit from 254 to 64k. (added in v0.38.0).  
   * Add features to reverse the order of an order list, and to append the reverse of an order list. (added in v0.39.0).  
   * Add console commands for conditional execution from game date. (added in v0.39.2).  
+  * Add client setting for vehicle naming scheme. (added in v0.40.0).  
+  * Add setting to control dates over which inflation is applied. (added in v0.40.0).  
   * Various minor fixes, see changelog.  
   * [NewGRF specification additions](docs/newgrf-additions.html) ([online copy](https://htmlpreview.github.io/?https://github.com/JGRennison/OpenTTD-patches/blob/jgrpp/docs/newgrf-additions.html)).
   * [NML specification additions](docs/newgrf-additions-nml.html) ([online copy](https://htmlpreview.github.io/?https://github.com/JGRennison/OpenTTD-patches/blob/jgrpp/docs/newgrf-additions-nml.html)).
diff --git a/jgrpp-changelog.md b/jgrpp-changelog.md
index abfe078bde..640815d26c 100644
--- a/jgrpp-changelog.md
+++ b/jgrpp-changelog.md
@@ -2,6 +2,32 @@
 
 * * *
 
+### v0.40.0 (2021-02-02)
+* Fix crash in auto-separation when all orders removed.
+* Fix crash when removing rail depot or road when debug window open on tile.
+* Signals on bridges/tunnels:
+  * Fix handling of bridge signals when reversing inside.
+  * Fix reversing behind waypoint/signal when front is inside a bridge/tunnel.
+  * Fix bridges not being redrawn after all signals reset when cleared.
+  * Fix reservation not being cleared from far end of signalled tunnel when removing.
+  * Fix handling of entrance availability when reversing inside bidrectionally signalled bridges/tunnels.
+  * Fix train crash which could occur when reversing trains on both sides of a bidirectional bridge/tunnel entrance tile.
+  * Set tunnel/bridge PBS exit to red when leaving.
+* Template-based train replacement:
+  * Add support for flipping engine/wagon directions.
+  * No longer use idle vehicles in depots by default.
+  * Use idle vehicles in depot no longer uses vehicles which have orders/shared orders, or are in a group.
+  * Fix vehicle window not being closed when acquiring idle vehicle for replacement.
+* Fix false positive desync warning messages for vehicle cached weight/length.
+* Add feature: realistic train braking.
+* Add setting for dates over which inflation is applied.
+* Add client setting for vehicle naming scheme.
+* Reduce clipping and graphical issues with NewGRF vehicle sets where the sprite bounds vary with overall curvature.
+* Show if train breakdown is due to collision with road vehicle, even if improved breakdowns is disabled.
+* Print warning instead of asserting for invalid NewGRF string IDs.
+* Add Korean translations by TELK.
+* Bump trunk base from commit b7851e51adf0fb0d39ed34a579cf6fe68d8949be to commit 069fb5425302edc93a77ca54b3665a7102747f5a.
+
 ### v0.39.2 (2020-12-29)
 * Fix crash which could occur when loading older scenarios or savegames which do not already have a company.
 * Fix crash which could occur when using the restart command after opening the save/load window.