diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index db2e9a7..a0309bb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        version: ['8.1', '8.2', '8.3', '8.4', '8.5']
+        version: ['8.1', '8.2', '8.3', '8.4', '8.5', '8.6']
     steps:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cea53e2..6f1e3e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,17 @@
 # Changelog
 
+## 2.0.13 - 2026-06-17
+
+* Fix build on PHP 8.6+ — replace `XtOffsetOf` with `offsetof` (issue #42)
+* Add PHP 8.6 to CI matrix
+
 ## 2.0.12 - 2026-04-07
 
+* Add PIE support (composer.json, package name pecl/oauth)
+* Drop .gitattributes export-ignore rules (issue #41) — preserves full source tree in GitHub archives for distro packagers
+
+## 2.0.11 - 2026-04-06
+
 * Fix segfault when OAuthProvider callback handler throws an exception (issue #27)
 * Replace deprecated cURL `curl_formadd()` API with MIME API for multipart form uploads (issue #37)
 * Fix double free in OAuth destructor for `headers_in` and `headers_out`
@@ -11,7 +21,6 @@
 * Fix memory leak in OAuthProvider callback registration on invalid callback type
 * Add multipart array cleanup in destructor for exception safety
 * Add GitHub Actions CI for PHP 8.1-8.5
-* Add PIE support (composer.json, package name pecl/oauth)
 
 ## 2.0.10 - 2025-10-09
 
diff --git a/package.xml b/package.xml
index adb608e..4121d58 100644
--- a/package.xml
+++ b/package.xml
@@ -47,9 +47,9 @@ Requirements: ext/hash (now a part of PHP core)
     <email>mike@php.net</email>
     <active>yes</active>
   </lead>
-  <date>2026-04-07</date>
+  <date>2026-06-17</date>
   <version>
-    <release>2.0.12</release>
+    <release>2.0.13</release>
     <api>2.0</api>
   </version>
   <stability>
@@ -59,15 +59,8 @@ Requirements: ext/hash (now a part of PHP core)
   <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
   <notes>
 <![CDATA[
-    * Fix segfault when OAuthProvider callback throws an exception (#27)
-    * Replace deprecated cURL curl_formadd() API with MIME API (#37)
-    * Fix double free in destructor for headers_in/headers_out
-    * Fix dangling pointers in multipart file/param storage
-    * Fix invalid free of shifted multipart param pointers
-    * Fix memory leak in provider auth header parsing
-    * Fix memory leak in provider callback registration
-    * Add GitHub Actions CI
-    * Add PIE support (composer.json, package name pecl/oauth)
+    * Fix build on PHP 8.6+ — replace XtOffsetOf with offsetof (#42)
+    * Add PHP 8.6 to CI matrix
 ]]>
   </notes>
   <contents>
@@ -198,6 +191,50 @@ Requirements: ext/hash (now a part of PHP core)
   </extsrcrelease>
   <changelog>
 
+  <release>
+    <date>2026-04-07</date>
+    <version>
+      <release>2.0.12</release>
+      <api>2.0</api>
+    </version>
+    <stability>
+      <release>stable</release>
+      <api>stable</api>
+    </stability>
+    <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
+    <notes>
+<![CDATA[
+    * Add PIE support (composer.json, package name pecl/oauth)
+    * Drop .gitattributes export-ignore rules (#41) — preserves full source tree in archives for distro packagers
+]]>
+    </notes>
+  </release>
+
+  <release>
+    <date>2026-04-06</date>
+    <version>
+      <release>2.0.11</release>
+      <api>2.0</api>
+    </version>
+    <stability>
+      <release>stable</release>
+      <api>stable</api>
+    </stability>
+    <license uri="http://www.opensource.org/licenses/bsd-license.php">BSD</license>
+    <notes>
+<![CDATA[
+    * Fix segfault when OAuthProvider callback throws an exception (#27)
+    * Replace deprecated cURL curl_formadd() API with MIME API (#37)
+    * Fix double free in destructor for headers_in/headers_out
+    * Fix dangling pointers in multipart file/param storage
+    * Fix invalid free of shifted multipart param pointers
+    * Fix memory leak in provider auth header parsing
+    * Fix memory leak in provider callback registration
+    * Add GitHub Actions CI
+]]>
+    </notes>
+  </release>
+
   <release>
     <date>2025-10-09</date>
     <version>
diff --git a/php_oauth.h b/php_oauth.h
index 4d4310d..8ce05c8 100644
--- a/php_oauth.h
+++ b/php_oauth.h
@@ -73,7 +73,7 @@
 	curl_formfree(f);
 #endif
 
-#define PHP_OAUTH_VERSION 2.0.12
+#define PHP_OAUTH_VERSION 2.0.13
 
 #define __stringify_1(x)    #x
 #define __stringify(x)      __stringify_1(x)