diff --git a/CHANGELOG.md b/CHANGELOG.md
index 221bfb7..cacfc75 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.0.0beta6 (April 10, 2017)
+
+* Near the end of chapter 6, add `if (last_match == -1) direction = 1;` to
+  `editorFindCallback()`, to fix a segfault. (Thanks @agacek)
+* In the [Scrolling with Page Up and Page Down](http://viewsourcecode.org/snaptoken/kilo/04.aTextViewer.html#scrolling-with-page-up-and-page-down)
+  section in chapter 4, add `if (E.cy > E.numrows) E.cy = E.numrows;` to
+  `editorProcessKeypress()`, so the cursor stays within the file. (Thanks
+  @agacek)
+* At the beginning of chapter 3, remove the keypress printing code during the
+  `refactor-input` step instead of the `ctrl-q` step, and make it clear that
+  you're supposed to remove that code. (Thanks @wonthegame)
+
 ## 1.0.0beta5 (April 9, 2017)
 
 * Remove *all* newlines and carriage returns from the end of each line read by
diff --git a/leg.yml b/leg.yml
index 09c316e..cb91bbe 100644
--- a/leg.yml
+++ b/leg.yml
@@ -1,6 +1,6 @@
 ---
 :name: kilo
-:version: "1.0.0beta5"
+:version: "1.0.0beta6"
 :title: Build Your Own Text Editor
 :rouge_theme: github
 :bold_weight: 500