diff --git a/MANIFEST.in b/MANIFEST.in
index c26b932..a7f4b5b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,5 @@
 include versioneer.py
 include src/wormhole/_version.py
+include LICENSE README.md
+recursive-include docs *.md *.rst
+
diff --git a/setup.py b/setup.py
index bc491aa..71e5568 100644
--- a/setup.py
+++ b/setup.py
@@ -19,8 +19,9 @@ setup(name="magic-wormhole",
       url="https://github.com/warner/magic-wormhole",
       package_dir={"": "src"},
       packages=["wormhole",
-                "wormhole.blocking", "wormhole.scripts",
-                "wormhole.test", "wormhole.util"],
+                "wormhole.blocking", "wormhole.twisted",
+                "wormhole.scripts", "wormhole.test", "wormhole.util",
+                "wormhole.servers"],
       entry_points={"console_scripts":
                     ["wormhole = wormhole.scripts.runner:entry"]},
       install_requires=["spake2==0.2", "pynacl", "requests", "argparse"],