diff --git a/debian/changelog b/debian/changelog
index 371213247..b76dd2523 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,17 @@ plinth (0.17.0) UNRELEASED; urgency=medium
 
   [ Joseph Nuthalapati ]
   * transmission: Enable Single Sign On.
+  * cockpit: Add short description to frontpage shortcut.
+
+  [ Allan Nordhøy ]
+  * fail2ban: Spelling "Fail2ban" and sentence structure.
 
   [ Ravi Bolla ]
   * config: Refactor config.py into views and form.
 
+  [ James Valleroy ]
+  * Removed old changelog.
+
  -- James Valleroy <jvalleroy@mailbox.org>  Mon, 13 Nov 2017 06:53:34 -0500
 
 plinth (0.16.0) unstable; urgency=medium
diff --git a/doc/freedombox-manual.xml b/doc/freedombox-manual.xml
index b789dbef3..744d9b4d0 100644
--- a/doc/freedombox-manual.xml
+++ b/doc/freedombox-manual.xml
@@ -4164,6 +4164,25 @@ nmcli con modify "&lt;connection_name&gt;" connection.zone internal</screen>
       <para>It also allows FreedomBox to discover other devices and services running on your local network.    </para>
       <para>Service discovery is not essential and works only on internal networks. It may be disabled to improve security especially when connecting to a hostile local network. </para>
     </section>
+    <section>
+      <title>Snapshots</title>
+      <para><emphasis>Snapshots</emphasis> allows you to create filesystem snapshots, and rollback the system to a previous snapshot. </para>
+      <itemizedlist>
+        <listitem>
+          <para>Note: This feature requires a Btrfs filesystem. All of the FreedomBox stable disk images use Btrfs. </para>
+        </listitem>
+      </itemizedlist>
+      <para>
+        <inlinemediaobject>
+          <imageobject>
+            <imagedata fileref="images/snapshots.png"/>
+          </imageobject>
+          <textobject>
+            <phrase>snapshots.png</phrase>
+          </textobject>
+        </inlinemediaobject>
+      </para>
+    </section>
     <section>
       <title>Software Upgrades</title>
       <para>FreedomBox can automatically install security upgrades.  On the <emphasis>Upgrades</emphasis> page of the <emphasis>Settings</emphasis> section in Plinth you can turn on automatic upgrades. For FreedomBox versions above 0.5, this feature is enabled by default and there is no manual action necessary.  It is strongly recommended that you have this option enabled to keep your FreedomBox secure. </para>
@@ -6760,6 +6779,20 @@ 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.17.0 (2017-11-20)</title>
+        <itemizedlist>
+          <listitem>
+            <para>transmission: Enable Single Sign On. </para>
+          </listitem>
+          <listitem>
+            <para>cockpit: Add short description to frontpage shortcut. </para>
+          </listitem>
+          <listitem>
+            <para>fail2ban: Fix spelling and sentence structure. </para>
+          </listitem>
+        </itemizedlist>
+      </section>
       <section>
         <title>Plinth v0.16.0 (2017-11-06)</title>
         <section>
diff --git a/doc/images/snapshots.png b/doc/images/snapshots.png
new file mode 100644
index 000000000..21e97959b
Binary files /dev/null and b/doc/images/snapshots.png differ