diff --git a/CHANGELOG.md b/CHANGELOG.md
index 357fa738..7597621a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Start testing on PyPy. Due to [#342](https://github.com/PyFilesystem/pyfilesystem2/issues/342)
   we have to treat PyPy builds specially and allow them to fail, but at least we'll
   be able to see if we break something aside from known issues with FTP tests.
+- Include docs in source distributions as well the whole tests folder,
+  ensuring `conftest.py` is present, fixes [#364](https://github.com/PyFilesystem/pyfilesystem2/issues/364).
 - Stop patching copy with Python 3.8+ because it already uses sendfile.
 
 ## [2.4.11] - 2019-09-07
diff --git a/MANIFEST.in b/MANIFEST.in
index 1aba38f6..99db56b1 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1,5 @@
 include LICENSE
+graft tests
+graft docs
+global-exclude __pycache__
+global-exclude *.py[co]