diff --git a/abi-check/changelog/openjpeg/current/log.html b/abi-check/changelog/openjpeg/current/log.html
index 13dda217..a04f5d2e 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 9a6d41d22b1a4f17a376d2f6f208c52c58b8e4b3
+<pre class='wrap'>commit 13cde9fa37249628af6b6f10601b733f87a025f4
+Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
+Date:   2017-07-30 19:46:52 +0200
+
+    src/lib/openjp2/*.h: use OPJ_ prefix for inclusion guards instead of reserved __ (#587)
+
+commit 9a6d41d22b1a4f17a376d2f6f208c52c58b8e4b3
 Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
 Date:   2017-07-30 19:27:01 +0200
 
@@ -372,7 +378,6 @@ Date:   2017-07-03 12:03:29 +0200
     build both shared and static library
 
 commit ecbfcbc2764ff1b09e693d57e3ef5764518f1e1c
-Merge: e673c8b 96d757c
 Author: Even Rouault &lt;even.rouault@mines-paris.org&gt;
 Date:   2017-07-01 13:51:52 +0200
 
@@ -380,32 +385,12 @@ Date:   2017-07-01 13:51:52 +0200
     
     Remove useless knownfailures (since LAZY encoding is fixed)
 
-commit e673c8bd4da9f0414da472ac5f3d8e03e5102982
-Author: Even Rouault &lt;even.rouault@mines-paris.org&gt;
-Date:   2017-07-01 12:54:39 +0200
-
-    Merge pull request #963 from rouault/travis_avx2
-    
-    Enable AVX2 at runtime on Travis-CI and AppVeyor
-
-commit 96d757cb8e6c3fb0e133817e5057ee5eae6a594d
-Author: Even Rouault &lt;even.rouault@spatialys.com&gt;
-Date:   2017-07-01 04:24:46 +0200
-
-    Remove useless knownfailures (since LAZY encoding is fixed)
-
 commit a0839cca24e19f1f0906e30ee1009ce89e4942b4
 Author: Jeroen Ooms &lt;jeroenooms@gmail.com&gt;
 Date:   2017-06-16 13:58:25 +0200
 
     only build both static and dynamic on non-windows
 
-commit 1329b3240aafb1b31328091eb6f7720787b391be
-Author: Jeroen Ooms &lt;jeroenooms@gmail.com&gt;
-Date:   2017-06-16 13:27:19 +0200
-
-    build both shared and static library
-
 ...</pre></div>
 
 </body>
diff --git a/abi-check/db/openjpeg/Tracker.data b/abi-check/db/openjpeg/Tracker.data
index 804968b6..7acc6cbe 100644
--- a/abi-check/db/openjpeg/Tracker.data
+++ b/abi-check/db/openjpeg/Tracker.data
@@ -473,7 +473,7 @@ $VAR1 = {
                       '2.1' => '2014-04-29 12:58',
                       '2.1.1' => '2016-07-05 14:54',
                       '2.1.2' => '2016-09-28 18:18',
-                      'current' => '2017-07-30 19:27:01'
+                      'current' => '2017-07-30 19:46:52'
                     },
           'HeadersDiff' => {
                              '1.1' => {
diff --git a/abi-check/timeline/openjpeg/index.html b/abi-check/timeline/openjpeg/index.html
index 391e7413..eb066900 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-07-30<br/>19:27</td>
+<td>2017-07-30<br/>19:46</td>
 <td>N/A</td>
 <td><a href='../../changelog/openjpeg/current/log.html'>changelog</a></td>
 <td>N/A</td>
@@ -152,7 +152,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 Sun Jul 30 17:37:55 2017.<br/>
+</table><br/>Maintained by <a href='http://www.openjpeg.org/'>OpenJPEG team</a>. Last updated on Sun Jul 30 17:57:06 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>