diff --git a/openhtf/py.typed b/openhtf/py.typed
new file mode 100644
index 000000000..e69de29bb
diff --git a/setup.py b/setup.py
index d68dc84fa..952987d89 100644
--- a/setup.py
+++ b/setup.py
@@ -191,6 +191,7 @@ def run_tests(self):
     packages=find_packages(),
     package_data={
         'openhtf': [
+            'py.typed',
             'output/proto/*.proto', 'output/web_gui/dist/*.*',
             'output/web_gui/dist/css/*', 'output/web_gui/dist/js/*',
             'output/web_gui/dist/img/*', 'output/web_gui/*.*'
@@ -219,4 +220,5 @@ def run_tests(self):
         'pytest>=2.9.2',
         'pytest-cov>=2.2.1',
     ],
+    zip_safe=False,
 )