diff --git a/debian/changelog b/debian/changelog
index 69e782e42..6e0a86dc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+plinth (0.20.0) UNRELEASED; urgency=high
+
+  [ James Valleroy ]
+  * bind: Rework getting and changing config
+  * bind: Don't use forwarders by default
+
+  [ Johannes Keyser ]
+  * ejabberd: Remove redundant button Client Apps
+  * ejabberd: Minor description cleanups
+
+  [ Joseph Nuthalpati ]
+  * mediawiki: Add wiki application
+
+  [ Sunil Mohan Adapa ]
+  * users: Make sure first run actually works
+  * bind: Add information about current utility
+  * storage: Make tests run on special filesystems
+
+ -- James Valleroy <jvalleroy@mailbox.org>  Mon, 01 Jan 2018 14:33:49 -0500
+
 plinth (0.19.0) unstable; urgency=medium
 
   [ James Valleroy ]
diff --git a/doc/freedombox-manual.xml b/doc/freedombox-manual.xml
index fa4142fe8..651e13335 100644
--- a/doc/freedombox-manual.xml
+++ b/doc/freedombox-manual.xml
@@ -6339,6 +6339,9 @@ $ sudo umount /tmp/vbox-root1
               <listitem>
                 <para>The "DEBIAN_FRONTEND=noninteractive" will avoid several configuration prompts that would otherwise appear during the install. </para>
               </listitem>
+              <listitem>
+                <para><emphasis role="strong">Note:</emphasis> If you are using Debian Buster or later, then the steps below (running setup script and rebooting) do not apply. You can jump to <ulink url="https://wiki.debian.org/FreedomBox/Use#">using</ulink> FreedomBox. </para>
+              </listitem>
             </itemizedlist>
           </listitem>
           <listitem>
@@ -6779,6 +6782,26 @@ wget https://www.thinkpenguin.com/files/ath9k_firmware_free-version/htc_7010.fw<
     <section>
       <title>Release Notes</title>
       <para>The following are the release notes for each FreedomBox version.  </para>
+      <section>
+        <title>Plinth v0.20.0 (2018-01-01)</title>
+        <itemizedlist>
+          <listitem>
+            <para>bind: Don't use forwarders by default </para>
+          </listitem>
+          <listitem>
+            <para>ejabberd: Remove redundant button Client Apps </para>
+          </listitem>
+          <listitem>
+            <para>mediawiki: Add wiki application </para>
+          </listitem>
+          <listitem>
+            <para>users: Make sure first run actually works </para>
+          </listitem>
+          <listitem>
+            <para>bind: Add information about current utility </para>
+          </listitem>
+        </itemizedlist>
+      </section>
       <section>
         <title>Plinth v0.19.0 (2017-12-18)</title>
         <itemizedlist>