diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6eb434a857498b2ea11a1f5c82b72a6a4e5527c..5dd0a736111452bf755a2a9bdf34d41abec16bb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
-# Revision history for tahoe-ssk
+# Changelog for tahoe-ssk
 
-## 0.1.0.0 -- YYYY-mm-dd
+## 0.2.1.0
 
-* First version. Released on an unsuspecting world.
+* Add Ord instances for StorageIndex, Verifier, Reader, and Writer.
+* Add ConfidentialShowable instances for SDMF, Verifier, Reader, and Writer.
+* Deprecate dangerRealShow.
+
+## 0.2.0.0
+
+* Add the IV as a parameter to Tahoe.SDMF.encode.
+  The IV must be the value used to create the ciphertext so Tahoe.SDMF.encode cannot randomly generate one.
+* Add Tahoe.SDMF.randomIV for randomly generating a new IV.
+
+## 0.1.0.0
+
+* Initial release.
+* Very basic non-verifying decoding support.
+* Enough encoding support for simple round-trip tests for the decoding functionality.
diff --git a/ChangeLog.rst b/ChangeLog.rst
deleted file mode 100644
index 5dd0a736111452bf755a2a9bdf34d41abec16bb8..0000000000000000000000000000000000000000
--- a/ChangeLog.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-# Changelog for tahoe-ssk
-
-## 0.2.1.0
-
-* Add Ord instances for StorageIndex, Verifier, Reader, and Writer.
-* Add ConfidentialShowable instances for SDMF, Verifier, Reader, and Writer.
-* Deprecate dangerRealShow.
-
-## 0.2.0.0
-
-* Add the IV as a parameter to Tahoe.SDMF.encode.
-  The IV must be the value used to create the ciphertext so Tahoe.SDMF.encode cannot randomly generate one.
-* Add Tahoe.SDMF.randomIV for randomly generating a new IV.
-
-## 0.1.0.0
-
-* Initial release.
-* Very basic non-verifying decoding support.
-* Enough encoding support for simple round-trip tests for the decoding functionality.
diff --git a/tahoe-ssk.cabal b/tahoe-ssk.cabal
index 71b7cad44f3067117fd58648fdd8a8baa4b2dd52..6eceb3ee18a43068ffecdfa1666efa0d1fa7475f 100644
--- a/tahoe-ssk.cabal
+++ b/tahoe-ssk.cabal
@@ -53,13 +53,13 @@ category:           Cryptography,Library,Parsers,Security
 build-type:         Simple
 
 -- Extra doc files to be distributed with the package, such as a CHANGELOG or a README.
-extra-doc-files:    ChangeLog.rst
+extra-doc-files:
+  CHANGELOG.md
+  README.md
 
 -- Extra source files to be distributed with the package, such as examples, or
 -- a tutorial module.
 extra-source-files:
-  ChangeLog.rst
-  README.md
   test/data/3of10.0
   test/data/3of10.1
   test/data/3of10.2