diff --git a/abi-check/changelog/openjpeg/current/log.html b/abi-check/changelog/openjpeg/current/log.html
index 83df34aa..ace79fcd 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 8fc09e50e557fa6af4c099b9c6d36bb1071ee1ed
+<pre class='wrap'>commit 0e6a5553cfef21b764d289585af2c6934a95456b
+Merge: 8fc09e5 ca16fe5
+Author: Even Rouault &lt;even.rouault@mines-paris.org&gt;
+Date:   2018-09-22 23:54:12 +0200
+
+    Merge pull request #1148 from hlef/master
+    
+    CVE-2018-5785: fix issues with zero bitmasks
+
+commit 8fc09e50e557fa6af4c099b9c6d36bb1071ee1ed
 Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
 Date:   2018-09-22 23:47:56 +0200
 
@@ -127,6 +136,34 @@ Date:   2018-09-22 21:56:50 +0200
 
     Update knownfailures- files given current configurations
 
+commit ca16fe55014c57090dd97369256c7657aeb25975
+Author: Hugo Lefeuvre &lt;hle@debian.org&gt;
+Date:   2018-09-22 14:33:19 -0400
+
+    convertbmp: fix issues with zero bitmasks
+    
+    In the case where a BMP file declares compression 3 (BI_BITFIELDS)
+    with header size &lt;= 56, all bitmask values keep their initialization
+    value 0. This may lead to various undefined behavior later e.g. when
+    doing 1 &lt;&lt; (l_comp-&gt;prec - 1).
+    
+    This issue does not affect files with bit count 16 because of a check
+    added in 16240e2 which sets default values to the color masks if they
+    are all 0.
+    
+    This commit adds similar checks for the 32 bit case.
+    
+    Also, if a BMP file declares compression 3 with header size &gt;= 56 and
+    intentional 0 bitmasks, the same issue will be triggered in both the
+    16 and 32 bit count case.
+    
+    This commit adds checks to bmp_read_info_header() rejecting BMP files
+    with "intentional" 0 bitmasks. These checks might be removed in the
+    future when proper handling of zero bitmasks will be available in
+    openjpeg2.
+    
+    fixes #1057 (CVE-2018-5785)
+
 commit 31a03b390a77bfbe4b0f140121d1296acb611f76
 Author: Stefan Weil &lt;sw@weilnetz.de&gt;
 Date:   2018-09-05 21:51:30 +0200
@@ -767,18 +804,6 @@ Date:   2017-09-19 12:46:20 +0200
 
     Fix warnings and errors when compiling with a c++ compiler (#1021)
 
-commit 18f6696372f4c32334385f8dcc8d39ad8ac24601
-Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
-Date:   2017-09-19 12:13:34 +0200
-
-    Fix compilation with AppleClang 8.1.0.8020042 (#1020)
-
-commit 3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b
-Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
-Date:   2017-09-17 12:17:49 +0200
-
-    Build: make sure that -DBUILD_SHARED_LIBS:bool=off is honoured to build only the static lib (#1019)
-
 ...</pre></div>
 
 </body>
diff --git a/abi-check/db/openjpeg/Tracker.data b/abi-check/db/openjpeg/Tracker.data
index 93011932..1f7cb599 100644
--- a/abi-check/db/openjpeg/Tracker.data
+++ b/abi-check/db/openjpeg/Tracker.data
@@ -633,7 +633,7 @@ $VAR1 = {
                       '2.1.2' => '2016-09-28 18:18',
                       '2.2.0' => '2017-08-10 00:31',
                       '2.3.0' => '2017-10-04 22:23',
-                      'current' => '2018-09-22 23:47:56'
+                      'current' => '2018-09-22 23:54:12'
                     },
           'HeadersDiff' => {
                              '1.1' => {
@@ -731,7 +731,7 @@ $VAR1 = {
           'Maintainer' => 'OpenJPEG team',
           'MaintainerUrl' => 'http://www.openjpeg.org/',
           'PackageDiff' => {},
-          'ScmUpdateTime' => '1537653682',
+          'ScmUpdateTime' => '1537654210',
           '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 fbf38ce7..19ac0c7f 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.3.0 b/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.3.0
index f286bda1..67b8a875 100644
Binary files a/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.3.0 and b/abi-check/installed/openjpeg/current/lib/libopenjp2.so.2.3.0 differ
diff --git a/abi-check/timeline/openjpeg/index.html b/abi-check/timeline/openjpeg/index.html
index 4045523c..391bdc2c 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>2018-09-22<br/>23:47</td>
+<td>2018-09-22<br/>23:54</td>
 <td>7</td>
 <td><a href='../../changelog/openjpeg/current/log.html'>changelog</a></td>
 <td class='ok'><a href='../../objects_report/openjpeg/2.3.0/current/report.html'>100%</a></td>
@@ -170,7 +170,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 Sat Sep 22 22:01:45 2018.<br/>
+</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Sat Sep 22 22:10:34 2018.<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>