diff --git a/CHANGELOG.rst b/CHANGELOG.rst
new file mode 100644
index 0000000..b87b872
--- /dev/null
+++ b/CHANGELOG.rst
@@ -0,0 +1,34 @@
+Changelog
+=========
+
+0.3 - 2014-XX-XX
+~~~~~~~~~~~~~~~~
+
+* Added :class:`~cryptography.hazmat.primitives.twofactor.hotp.HOTP`.
+
+0.2.1 - 2014-02-22
+~~~~~~~~~~~~~~~~~~
+* Fix a bug where importing cryptography from multiple paths could cause initialization to fail.
+
+0.2 - 2014-02-20
+~~~~~~~~~~~~~~~~
+
+* Added :doc:`/hazmat/backends/commoncrypto`.
+* Added initial :doc:`/hazmat/bindings/commoncrypto`.
+* Removed ``register_cipher_adapter`` method from
+  :class:`~cryptography.hazmat.backends.interfaces.CipherBackend`.
+* Added support for the OpenSSL backend under Windows.
+* Improved thread-safety for the OpenSSL backend.
+* Fixed compilation on systems where OpenSSL's ``ec.h`` header is not
+  available, such as CentOS.
+* Added :class:`~cryptography.hazmat.primitives.kdf.pbkdf2.PBKDF2HMAC`.
+* Added :class:`~cryptography.hazmat.primitives.kdf.hkdf.HKDF`.
+* Added :doc:`/hazmat/backends/multibackend`.
+* Set default random for the :doc:`/hazmat/backends/openssl` to the OS random engine.
+* Added :class:`~cryptography.hazmat.primitives.ciphers.algorithms.CAST5` (CAST-128) support.
+
+0.1 - 2014-01-08
+~~~~~~~~~~~~~~~~
+
+* Initial release.
+
diff --git a/MANIFEST.in b/MANIFEST.in
index c5ca035..93d9551 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,7 @@
-include LICENSE
 include AUTHORS.rst
+include CHANGELOG.rst
 include CONTRIBUTING.rst
+include LICENSE
 include README.rst
 
 recursive-include tests *.py
diff --git a/docs/changelog.rst b/docs/changelog.rst
index b87b872..565b052 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,34 +1 @@
-Changelog
-=========
-
-0.3 - 2014-XX-XX
-~~~~~~~~~~~~~~~~
-
-* Added :class:`~cryptography.hazmat.primitives.twofactor.hotp.HOTP`.
-
-0.2.1 - 2014-02-22
-~~~~~~~~~~~~~~~~~~
-* Fix a bug where importing cryptography from multiple paths could cause initialization to fail.
-
-0.2 - 2014-02-20
-~~~~~~~~~~~~~~~~
-
-* Added :doc:`/hazmat/backends/commoncrypto`.
-* Added initial :doc:`/hazmat/bindings/commoncrypto`.
-* Removed ``register_cipher_adapter`` method from
-  :class:`~cryptography.hazmat.backends.interfaces.CipherBackend`.
-* Added support for the OpenSSL backend under Windows.
-* Improved thread-safety for the OpenSSL backend.
-* Fixed compilation on systems where OpenSSL's ``ec.h`` header is not
-  available, such as CentOS.
-* Added :class:`~cryptography.hazmat.primitives.kdf.pbkdf2.PBKDF2HMAC`.
-* Added :class:`~cryptography.hazmat.primitives.kdf.hkdf.HKDF`.
-* Added :doc:`/hazmat/backends/multibackend`.
-* Set default random for the :doc:`/hazmat/backends/openssl` to the OS random engine.
-* Added :class:`~cryptography.hazmat.primitives.ciphers.algorithms.CAST5` (CAST-128) support.
-
-0.1 - 2014-01-08
-~~~~~~~~~~~~~~~~
-
-* Initial release.
-
+.. include:: ../CHANGELOG.rst