diff --git a/.ottdrev-vc b/.ottdrev-vc
index e9f1eea2b2..0e5a2562a0 100644
--- a/.ottdrev-vc
+++ b/.ottdrev-vc
@@ -1,2 +1,2 @@
-jgrpp-0.17.2	27747	0	jgrpp-0.17.2
-50383058b9387c70f87c7b4cf3958c25dfc3ded1b5234a812694115aa1b358a6  -
+jgrpp-0.18.0	27846	0	jgrpp-0.18.0
+2e28cdfaeb8ffe2caa8d347e12bd5dcd445949cb2b4265737b3e9677adbf9c51  -
diff --git a/README.md b/README.md
index 68a5eefd72..081629c84b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## JGR's Patchpack version 0.17.2
+## JGR's Patchpack version 0.18.0
 
 This is a collection of patches applied to [OpenTTD](http://www.openttd.org/)
 
@@ -165,6 +165,14 @@ See [jgrpp-changelog.md](jgrpp-changelog.md) for changelog.
 
 * Custom bridge heads for road bridges (added in v0.17.0)
 
+* Chunnels (tunnels under bodies of water) [imported](https://www.tt-forums.net/viewtopic.php?f=33&t=41775) (added in v0.18.0)  
+  This is enabled by a setting (off by default).
+
+* Give money to company, instead of player [imported](https://www.tt-forums.net/viewtopic.php?f=33&t=63899) (added in v0.18.0)  
+  This has been modified to broadcast money transfer notifications to all players.
+
+* Minimum town distance [imported](https://www.tt-forums.net/viewtopic.php?f=33&t=33625) (added in v0.18.0)
+
 * Performance improvements  
   * Improve dedicated server performance. Up to approximately 2.5x faster. (added in v0.8.1)  
   * Improve cargodest link graph calculation performance. Up to approximately 2x faster. (~1.3x faster in v0.8.1, further improvements in v0.17.2)  
@@ -189,7 +197,8 @@ See [jgrpp-changelog.md](jgrpp-changelog.md) for changelog.
   * Increase maximum permitted vehicle name length (added in v0.17.0), and vehicle group name length (added in v0.17.2)
 
 * Translations  
-  * German (by Auge): including vehicle group info, vehicle details window, the zoning toolbar, and settings for improved breakdowns and adjacent level crossings.
+  * German (by Auge)  
+  * Korean (by kiwitreekor)
 
 
 #### Caveats for loading savegames from the [Spring 2013 Patch Pack](http://www.tt-forums.net/viewtopic.php?f=33&t=66892):  
diff --git a/jgrpp-changelog.md b/jgrpp-changelog.md
index 27093a9e82..a1a48935b2 100644
--- a/jgrpp-changelog.md
+++ b/jgrpp-changelog.md
@@ -2,6 +2,30 @@
 
 * * *
 
+### v0.18.0 (2017-04-04)
+* Fix incorrect behaviour and crashes with custom bridge heads on steep slopes.
+* Fix day length not being reset to 1 when loading pre day-length savegames.
+* Signals on bridges/tunnels:
+  * Fix bridge/tunnel exit PBS signals never being set to green.
+* Routing restrictions:
+  * Fix evaluation of PBS entry signal conditional after reserve through.
+  * Fix removal of PBS entry signal conditional instruction.
+  * Add buttons to GUI to move instructions up/down.
+  * Allow shallow-removing conditional blocks by use of ctrl+click.
+  * Implement instruction scroll-to for PBS entry signal conditional.
+* Template-based train replacement:
+  * Assume that virtual vehicles are on a suitably powered railtype.
+  * Fix virtual vehicles not having their build year set, which caused incorrect properties with some NewGRF sets.
+* Enhanced viewport plans:
+  * Fix various alignment issues in plans window.
+  * Add a show all button.
+  * Add ctrl+click to scroll to plan.
+* Fix height above sea-level in measurement tool.
+* Add chunnel patch (tunnels under bodies of water).
+* Add minimum town distance patch.
+* Add give money to company patch.
+* Bump trunk base from r27747 to r27846
+
 ### v0.17.2 (2017-02-22)
 * Fix crash due to articulated trams decoupling when doing a U-turn, when the end-of-line was removed mid-way through the turn.
 * Fix wrong calculation of company infrastructure totals for road tunnels, which could cause multiplayer desyncs.