diff --git a/poetry/masonry/utils/package_include.py b/poetry/masonry/utils/package_include.py
index 0484faf04d5..15c4a9d6c78 100644
--- a/poetry/masonry/utils/package_include.py
+++ b/poetry/masonry/utils/package_include.py
@@ -38,7 +38,10 @@ def stub_only(self):  # type: () -> bool
         # returns `True` if this a PEP 561 stub-only package,
         # see [PEP 561](https://www.python.org/dev/peps/pep-0561/#stub-only-packages)
         return self.package.endswith("-stubs") and all(
-            el.suffix == ".pyi" for el in self.elements if el.is_file()
+            el.suffix == ".pyi"
+            or (el.parent.name == self.package and el.name == "py.typed")
+            for el in self.elements
+            if el.is_file()
         )
 
     @property
diff --git a/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pkg-stubs/__init__.pyi b/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pkg-stubs/__init__.pyi
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pkg-stubs/module.pyi b/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pkg-stubs/module.pyi
new file mode 100644
index 00000000000..d79e6e39ee0
--- /dev/null
+++ b/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pkg-stubs/module.pyi
@@ -0,0 +1,4 @@
+"""Example module"""
+from typing import Tuple
+
+version_info = Tuple[int, int, int]
diff --git a/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pkg-stubs/py.typed b/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pkg-stubs/py.typed
new file mode 100644
index 00000000000..b648ac92333
--- /dev/null
+++ b/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pkg-stubs/py.typed
@@ -0,0 +1 @@
+partial
diff --git a/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pkg-stubs/subpkg/__init__.pyi b/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pkg-stubs/subpkg/__init__.pyi
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pyproject.toml b/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pyproject.toml
new file mode 100644
index 00000000000..db202c04a1c
--- /dev/null
+++ b/tests/masonry/builders/fixtures/pep_561_stub_only_partial/pyproject.toml
@@ -0,0 +1,14 @@
+[tool.poetry]
+name = "pep-561-stubs"
+version = "0.1"
+description = "PEP 561 stub package example with the py.typed marker file"
+authors = [
+    "Oleg Höfling <oleg.hoefling@gmail.com>"
+]
+license = "MIT"
+packages = [
+    {include = "pkg-stubs"}
+]
+
+[tool.poetry.dependencies]
+python = "^3.6"
diff --git a/tests/masonry/builders/test_wheel.py b/tests/masonry/builders/test_wheel.py
index 1366c927e15..36f8c27170b 100644
--- a/tests/masonry/builders/test_wheel.py
+++ b/tests/masonry/builders/test_wheel.py
@@ -164,7 +164,10 @@ def test_dist_info_file_permissions():
         )
 
 
-@pytest.mark.parametrize("package", ["pep_561_stub_only", "pep_561_stub_only_src"])
+@pytest.mark.parametrize(
+    "package",
+    ["pep_561_stub_only", "pep_561_stub_only_partial", "pep_561_stub_only_src"],
+)
 def test_wheel_package_pep_561_stub_only(package):
     root = fixtures_dir / package
     WheelBuilder.make(Factory().create_poetry(root), NullEnv(), NullIO())
@@ -177,3 +180,15 @@ def test_wheel_package_pep_561_stub_only(package):
         assert "pkg-stubs/__init__.pyi" in z.namelist()
         assert "pkg-stubs/module.pyi" in z.namelist()
         assert "pkg-stubs/subpkg/__init__.pyi" in z.namelist()
+
+
+def test_wheel_package_pep_561_stub_only_includes_typed_marker():
+    root = fixtures_dir / "pep_561_stub_only_partial"
+    WheelBuilder.make(Factory().create_poetry(root), NullEnv(), NullIO())
+
+    whl = root / "dist" / "pep_561_stubs-0.1-py3-none-any.whl"
+
+    assert whl.exists()
+
+    with zipfile.ZipFile(str(whl)) as z:
+        assert "pkg-stubs/py.typed" in z.namelist()