diff --git a/.ottdrev-vc b/.ottdrev-vc
index 62be48308a..67506bfbf6 100644
--- a/.ottdrev-vc
+++ b/.ottdrev-vc
@@ -1,2 +1,2 @@
-jgrpp-0.21.0	27912	0	jgrpp-0.21.0
-f9f4cf47a8609ece71d60931d5eb50a45aad665a5e1566c05579f3d0e58badcd  -
+jgrpp-0.22.0	27927	0	jgrpp-0.22.0
+d91b285372d82627203acf5127faafade81a8d1ce5e1accf37119e29be54193a  -
diff --git a/README.md b/README.md
index 330259ca8a..86ab1dc84b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## JGR's Patchpack version 0.21.0
+## JGR's Patchpack version 0.22.0
 
 This is a collection of patches applied to [OpenTTD](http://www.openttd.org/)
 
@@ -197,6 +197,12 @@ See [jgrpp-changelog.md](jgrpp-changelog.md) for changelog.
   * Add a 32bpp SSE2 palette animator. This is ~4x faster than the non-accelerated palette animator. (added in v0.9.0)  
   * Various minor changes (see changelog).
 
+* Multiple docs per station [imported](https://github.com/KeldorKatarn/OpenTTD_PatchPack/tree/feature/multiple_docks) (added in v0.22.0)
+
+* Cargo type filter in vehicle list windows [imported](https://www.tt-forums.net/viewtopic.php?f=33&t=77147) (added in v0.22.0)  
+  This has been modified to support more windows and more cargo options.  
+  This is enabled by a setting (on by default).
+
 * 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.  
diff --git a/jgrpp-changelog.md b/jgrpp-changelog.md
index 1e3690862c..76720714c8 100644
--- a/jgrpp-changelog.md
+++ b/jgrpp-changelog.md
@@ -2,6 +2,19 @@
 
 * * *
 
+### v0.22.0 (2017-10-17)
+* Template-based train replacement:
+  * Fix crash when creating template vehicle in some cases
+* Fix crash in bootstrap mode (base graphics not installed yet) when attempting to perform keyboard scrolling
+* Fix crash involving freeing of NewGRF modified airport data
+* Fix timetabled full-load order warning being shown for non station orders in timetable window
+* Fix not being allowed to build docks or ship depots, when removing sea/rivers is disabled
+* Fix incorrect scheduling of linkgraph jobs with a large number of nodes which caused poor performance
+* Add support for multiple docks per station
+* Add show passenger and show freight buttons to departure window
+* Add cargo type list filter to vehicle list windows, controlled by a setting
+* Bump trunk base from r27912 to r27927
+
 ### v0.21.0 (2017-09-05)
 * Fix numerical overflow in date display/conversion when using high day lengths
 * Fix assertion when a GRF supplies an invalid sound.
@@ -254,7 +267,7 @@
 * Allow changing the timetabled waiting time for all of a vehicle's orders at once.
 * Run tile animations at the normal rate regardless of day length factor.
 * Routing restrictions:
-  * Fix unreserving through a green PBS signal not setting the state to red.  
+  * Fix unreserving through a green PBS signal not setting the state to red.
     This also fixes unsuccessful reservation attempts though a reserve-through signal erroneously leaving the signal set to green.
 * Infrastructure sharing:
   * Add company settings to enable competitors to buy/renew vehicles in this company's depots.
@@ -455,7 +468,7 @@
 * Pause the game instead of blocking when cargo dest link graph jobs lag.
 * Update routing restrictions patch:
   * Program GUI changes to make 'or if' conditions easier to add, remove and use.
-  * Add a 'reserve through' program command.  
+  * Add a 'reserve through' program command.
     If a restricted PBS signal uses this command, PBS reservations which would otherwise stop at this signal instead continue through it to the next signal/waiting point. In effect this allows the 'safe waiting point' property of a PBS signal to be conditionally turned off.
   * Improvements to the correctness and thoroughness of the program validator.
 * Bump trunk base from r27389 to r27394