diff --git a/abi-check/changelog/openjpeg/current/log.html b/abi-check/changelog/openjpeg/current/log.html
index 185c558f..beb60e21 100644
--- a/abi-check/changelog/openjpeg/current/log.html
+++ b/abi-check/changelog/openjpeg/current/log.html
@@ -20,7 +20,16 @@
 <br/>
 <h1>Changelog from Git</h1><br/><br/>
 <div class='changelog'>
-<pre class='wrap'>commit 003759a4829f3f1baa5a2292956618fecf314818
+<pre class='wrap'>commit 297f202104fc0ff6b0627e15e7e6883c915f80bf
+Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
+Date:   2017-09-06 16:49:28 +0200
+
+    Fix 2.2.0 regression when reading codestream with reperated calls to opj_get_decoded_tile() where tile parts of a same tile are not consecutive
+    
+    This check was introduced per #939, but relied on the incorrect assumption
+    we decode all the tile parts of all tiles.
+
+commit 003759a4829f3f1baa5a2292956618fecf314818
 Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
 Date:   2017-09-06 15:59:19 +0200
 
@@ -622,12 +631,6 @@ Date:   2017-08-10 16:58:36 +0200
 
     Fix argument order in error message of previous commit
 
-commit 0b4fef6d1901254e41ab74ed681daba477d724c3
-Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
-Date:   2017-08-10 16:49:47 +0200
-
-    Propagate event manager down to opj_t2_encode_packet() and use it to emit an error message when the output buffer is too small
-
 ...</pre></div>
 
 </body>
diff --git a/abi-check/db/openjpeg/Tracker.data b/abi-check/db/openjpeg/Tracker.data
index 7b21962c..2d5c7c9d 100644
--- a/abi-check/db/openjpeg/Tracker.data
+++ b/abi-check/db/openjpeg/Tracker.data
@@ -560,7 +560,7 @@ $VAR1 = {
                       '2.1.1' => '2016-07-05 14:54',
                       '2.1.2' => '2016-09-28 18:18',
                       '2.2.0' => '2017-08-10 00:31',
-                      'current' => '2017-09-06 15:59:19'
+                      'current' => '2017-09-06 16:49:28'
                     },
           'HeadersDiff' => {
                              '1.1' => {
@@ -648,7 +648,7 @@ $VAR1 = {
           'Maintainer' => 'OpenJPEG team',
           'MaintainerUrl' => 'http://www.openjpeg.org/',
           'PackageDiff' => {},
-          'ScmUpdateTime' => '1504707486',
+          'ScmUpdateTime' => '1504711123',
           'Soname' => {
                         '1.1' => {
                                    'lib/libopenjpeg.so' => 'libopenjpeg.so'
diff --git a/abi-check/installed/openjpeg/current/lib/libopenjp2.a b/abi-check/installed/openjpeg/current/lib/libopenjp2.a
index 34ce1497..9d424562 100644
Binary files a/abi-check/installed/openjpeg/current/lib/libopenjp2.a and b/abi-check/installed/openjpeg/current/lib/libopenjp2.a differ
diff --git a/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.2.0 b/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.2.0
index 28b7504b..78d9759e 100644
Binary files a/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.2.0 and b/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.2.0 differ
diff --git a/abi-check/timeline/openjpeg/index.html b/abi-check/timeline/openjpeg/index.html
index 0b65a5af..3b73b966 100644
--- a/abi-check/timeline/openjpeg/index.html
+++ b/abi-check/timeline/openjpeg/index.html
@@ -30,7 +30,7 @@
 <th>Headers<br/>Diff</th>
 </tr>
 <tr id='current'><td>current</td>
-<td>2017-09-06<br/>15:59</td>
+<td>2017-09-06<br/>16:49</td>
 <td>7</td>
 <td><a href='../../changelog/openjpeg/current/log.html'>changelog</a></td>
 <td class='ok'><a href='../../objects_report/openjpeg/2.2.0/current/report.html'>100%</a></td>
@@ -161,7 +161,7 @@
 <td>N/A</td>
 <td>N/A</td>
 </tr>
-</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Wed Sep  6 14:18:31 2017.<br/>
+</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Wed Sep  6 15:19:08 2017.<br/>
 <br/>
 <hr/>
 <div align='right'><a class='home' title="Andrey Ponomarenko's ABI laboratory" href='http://abi-laboratory.pro/'>abi-laboratory.pro</a></div>