diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94ddc81a0f..218cad3e8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,27 @@
 Change Log
 ==========
 
+## Version 3.6.0
+
+_2023-10-01_
+
+ * Fix: Don't leak file handles when using `metadata` functions on `ZipFileSystem`. We had a bug
+   where we were closing the `.zip` file, but not a stream inside of it. We would have prevented
+   this bug if only we’d used `FakeFileSystem.checkNoOpenFiles()` in our tests!
+ * Fix: Don't build an index of a class loader's resources in `ResourceFileSystem.read()`. This
+   operation doesn't need this index, and building it is potentially expensive.
+ * New: Experimentally support Linux on ARM64 for Kotlin/Native targets (`linuxArm64`). Note that
+   we haven't yet added CI test coverage for this platform.
+ * Upgrade: [Kotlin 1.9.10][kotlin_1_9_10].
+
+
+## Version 1.17.6
+
+_2023-10-01_
+
+ * Fix: Don't crash decoding GZIP files when the optional extra data (`XLEN`) is 32 KiB or larger.
+
+
 ## Version 3.5.0
 
 _2023-08-02_
@@ -353,20 +374,20 @@ _2019-12-11_
    in a crash when subsequent reads encountered an unexpected empty segment.
 
 
-### Version 2.4.1
+## Version 2.4.1
 
 _2019-10-04_
 
  * Fix: Don't cache hash code and UTF-8 string in `ByteString` on Kotlin/Native which prevented freezing.
 
-### Version 2.4.0
+## Version 2.4.0
 
 _2019-08-26_
 
  * New: Upgrade to Kotlin 1.3.50.
 
 
-### Version 2.3.0
+## Version 2.3.0
 
 _2019-07-29_
 
@@ -858,6 +879,7 @@ _2014-04-08_
 [kotlin_1_6_20]: https://blog.jetbrains.com/kotlin/2022/04/kotlin-1-6-20-released/
 [kotlin_1_8_0]: https://kotlinlang.org/docs/whatsnew18.html
 [kotlin_1_9_0]: https://kotlinlang.org/docs/whatsnew19.html
+[kotlin_1_9_10]: https://github.com/JetBrains/kotlin/releases/tag/v1.9.10
 [loom]: https://wiki.openjdk.org/display/loom/Getting+started
 [maven_provided]: https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html
 [preview1]: https://github.com/WebAssembly/WASI/blob/main/legacy/preview1/docs.md
diff --git a/docs/index.md b/docs/index.md
index c1c15664e8..ad333dc556 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -95,7 +95,7 @@ Releases
 Our [change log][changelog] has release history.
 
 ```kotlin
-implementation("com.squareup.okio:okio:3.5.0")
+implementation("com.squareup.okio:okio:3.6.0")
 ```
 
 <details>
@@ -107,7 +107,7 @@ repositories {
 }
 
 dependencies {
-   implementation("com.squareup.okio:okio:3.5.0")
+   implementation("com.squareup.okio:okio:3.6.0")
 }
 ```
 
diff --git a/gradle.properties b/gradle.properties
index 86fa91bfbd..e4b289282a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,5 +15,5 @@ kotlin.mpp.stability.nowarn=true
 kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 GROUP=com.squareup.okio
-VERSION_NAME=3.6.0-SNAPSHOT
+VERSION_NAME=3.6.0
 kotlin.mpp.commonizerLogLevel=info