diff --git a/AUTHORS b/AUTHORS
index e0c7f54121..058017d8ab 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -124,6 +124,7 @@ Billiam
 Billy Moon
 Bin Ni
 binny
+Bjarki Ágúst Guðmundsson
 Bjorn Hansen
 B Krishna Chaitanya
 Blaine G
@@ -133,6 +134,7 @@ boomyjee
 Bo Peng
 borawjm
 Boris K
+Boris Verkhovskiy
 Brad Metcalf
 Brandon Frohs
 Brandon Wamboldt
@@ -262,6 +264,7 @@ Enam Mijbah Noor
 Eric Allam
 Eric Bogard
 Erik Demaine
+Erik Krogh Kristensen
 Erik Welander
 erosman
 eustas
@@ -270,6 +273,7 @@ Fabien Dubosson
 Fabien O'Carroll
 Fabio Zendhi Nagao
 Faiza Alsaied
+Faris Masad
 Fauntleroy
 fbuchinger
 feizhang365
@@ -294,6 +298,7 @@ Frank Wiegand
 fraxx001
 Fredrik Borg
 FUJI Goro (gfx)
+fzipp
 Gabriel Gheorghian
 Gabriel Horner
 Gabriel Nahmias
@@ -335,6 +340,7 @@ Haoran Yu
 Harald Schilly
 Hardest
 Harshvardhan Gupta
+Harutyun Amirjanyan
 Hasan Delibaş
 Hasan Karahan
 Heanes
@@ -497,6 +503,7 @@ Kim-Anh Tran
 Klaus Silveira
 Koh Zi Han, Cliff
 komakino
+kometenstaub
 Konrad Zapotoczny
 Konstantin Chernenko
 Konstantin Lopuhin
@@ -735,6 +742,7 @@ Pi Delport
 Pierre Gerold
 Pieter Ouwerkerk
 Piyush
+Pontus Granström
 Pontus Melke
 prasanthj
 Prasanth J
@@ -886,6 +894,7 @@ thomasmaclean
 Thomas Schmid
 Tim Alby
 Tim Baumann
+Tim Down
 Tim Gates
 Tim Nguyen
 Timothy Farrell
@@ -945,6 +954,7 @@ Wojtek Ptak
 wonderboyjon
 Wu Cheng-Han
 Xavier Mendez
+Yakov Manshin
 Yang Guo
 Yash Singh
 Yash-Singh1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef2f9bef8c..4ff4d5ca10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 5.65.7 (2022-07-20)
+
+### Bug fixes
+
+Fix several references to the global `document`/`window`, improving support for creating an editor in another frame.
+
+[vim bindings](https://codemirror.net/5/demo/vim.html): Use [upstream](https://github.com/replit/codemirror-vim/) code instead of keeping our own copy.
+
+[tern addon](https://codemirror.net/5/demo/tern.html): Properly HTML escape variable names in rename dialog.
+
 ## 5.65.6 (2022-06-20)
 
 ### Bug fixes
diff --git a/doc/manual.html b/doc/manual.html
index e2fcf6ecf8..bfeec73e98 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -70,7 +70,7 @@
 <section class=first id=overview>
     <h2 style="position: relative">
       User manual and reference guide
-      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.6</span>
+      <span style="color: #888; font-size: 1rem; position: absolute; right: 0; bottom: 0">version 5.65.7</span>
     </h2>
 
     <p>CodeMirror is a code-editor component that can be embedded in
diff --git a/doc/releases.html b/doc/releases.html
index f42d6aac5e..c3201a48b4 100644
--- a/doc/releases.html
+++ b/doc/releases.html
@@ -28,8 +28,20 @@ <h2>Release notes and version history</h2>
 
 <section id=v5 class=first>
 
+  <h2>Version 6.x</h2>
+
+  <p>See <a href="https://codemirror.net/docs/changelog/">the new website</a>.</p>
+
   <h2>Version 5.x</h2>
 
+  <p class="rel">20-07-2022: <a href="https://codemirror.net/5/codemirror-5.65.7.zip">Version 5.65.7</a>:</p>
+
+  <ul class="rel-note">
+    <li>Fix several references to the global <code>document</code>/<code>window</code>, improving support for creating an editor in another frame.</li>
+    <li><a href="https://codemirror.net/5/demo/vim.html">vim bindings</a>: Use <a href="https://github.com/replit/codemirror-vim/">upstream</a> code instead of keeping our own copy.</li>
+    <li><a href="https://codemirror.net/5/demo/tern.html">tern addon</a>: Properly HTML escape variable names in rename dialog.</li>
+  </ul>
+
   <p class="rel">20-06-2022: <a href="https://codemirror.net/5/codemirror-5.65.6.zip">Version 5.65.6</a>:</p>
 
   <ul class="rel-note">
diff --git a/index.html b/index.html
index 947b79d187..b70dcbbe67 100644
--- a/index.html
+++ b/index.html
@@ -92,7 +92,7 @@ <h2>This is CodeMirror</h2>
   </script>
 
   <div class=actions>
-    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.6</a>.<br>
+    Get the current version: <a href="https://codemirror.net/5/codemirror.zip">5.65.7</a>.<br>
     You can see the <a href="https://github.com/codemirror/codemirror5" title="GitHub repository">code</a>,<br>
     read the <a href="doc/releases.html">release notes</a>,<br>
     or study the <a href="doc/manual.html">user manual</a>.
diff --git a/package.json b/package.json
index 6d30b98216..e8b7587750 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codemirror",
-  "version": "5.65.6",
+  "version": "5.65.7",
   "main": "lib/codemirror.js",
   "style": "lib/codemirror.css",
   "author": {
diff --git a/src/edit/main.js b/src/edit/main.js
index 6a1bdfb2a4..9e925a1ffa 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -66,4 +66,4 @@ import { addLegacyProps } from "./legacy.js"
 
 addLegacyProps(CodeMirror)
 
-CodeMirror.version = "5.65.6"
+CodeMirror.version = "5.65.7"