diff --git a/abi-check/changelog/openjpeg/current/log.html b/abi-check/changelog/openjpeg/current/log.html
index 42c3eea6..ce4f3313 100644
--- a/abi-check/changelog/openjpeg/current/log.html
+++ b/abi-check/changelog/openjpeg/current/log.html
@@ -20,7 +20,13 @@
 <br/>
 <h1>Changelog from Git</h1><br/><br/>
 <div class='changelog'>
-<pre class='wrap'>commit 1e387de74273c4dac618df94475556541c1caf3e
+<pre class='wrap'>commit 8e6c371e66d9c579048fd336cc3365869486080a
+Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
+Date:   2017-08-16 18:29:59 +0200
+
+    opj_t1_encode_cblk(): avoid uint32 overflow when numbps = 0 (which is well defined behaviour, and is properly handled here, but better avoid it to detect real issues)
+
+commit 1e387de74273c4dac618df94475556541c1caf3e
 Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
 Date:   2017-08-16 17:38:47 +0200
 
@@ -595,14 +601,6 @@ Date:   2017-07-29 19:03:13 +0200
     This has been recently fixed in a less elegant way per
     80818c39f5bfbac37768fcee95b0ffeceaa77264
 
-commit 3fbe71369019df0b47c7a2be4fab8c05768f2f32
-Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
-Date:   2017-07-29 18:38:16 +0200
-
-    opj_tcd_get_decoded_tile_size(): fix potential UINT32 overflow (#854, CVE-2016-5152)
-    
-    Fix derived from https://pdfium.googlesource.com/pdfium.git/+/d8cc503575463ff3d81b22dad292665f2c88911e/third_party/libopenjpeg20/0018-tcd_get_decoded_tile_size.patch
-
 ...</pre></div>
 
 </body>
diff --git a/abi-check/db/openjpeg/Tracker.data b/abi-check/db/openjpeg/Tracker.data
index 74d7e1f4..ce30caaf 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-08-16 17:38:47'
+                      'current' => '2017-08-16 18:29:59'
                     },
           'HeadersDiff' => {
                              '1.1' => {
@@ -648,7 +648,7 @@ $VAR1 = {
           'Maintainer' => 'OpenJPEG team',
           'MaintainerUrl' => 'http://www.openjpeg.org/',
           'PackageDiff' => {},
-          'ScmUpdateTime' => '1502899663',
+          'ScmUpdateTime' => '1502902500',
           '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 2b6a623c..4d7d235b 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 578108ac..9cfa74f0 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 5f756f47..23e12879 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-08-16<br/>17:38</td>
+<td>2017-08-16<br/>18:29</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 Aug 16 16:08:09 2017.<br/>
+</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Wed Aug 16 16:55:24 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>