diff --git a/CHANGELOG.md b/CHANGELOG.md
index f30ca6f9..8850b7ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+- Add py.typed export per [PEP 561](https://www.python.org/dev/peps/pep-0561/) [PR #158](https://github.com/model-bakers/model_bakery/pull/158)
+
 ### Changed
 
 ### Removed
diff --git a/model_bakery/py.typed b/model_bakery/py.typed
new file mode 100644
index 00000000..e69de29b
diff --git a/setup.py b/setup.py
index 68f17bb4..b99a48eb 100755
--- a/setup.py
+++ b/setup.py
@@ -16,6 +16,7 @@
     license=about["__license__"],
     packages=["model_bakery"],
     include_package_data=True,  # declarations in MANIFEST.in
+    package_data={"model_bakery": ["py.typed"]},
     install_requires=open(join(here, "requirements.txt")).readlines(),
     description="Smart object creation facility for Django.",
     long_description=open(join(dirname(__file__), "README.md")).read(),