diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-trio/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-trio/package.py
new file mode 100644
index 0000000000..191907db4f
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-trio/package.py
@@ -0,0 +1,22 @@
+# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack import *
+
+
+class PySphinxcontribTrio(PythonPackage):
+    """This sphinx extension helps you document Python code that uses
+    async/await, or abstract methods, or context managers, or generators,
+    or ... you get the idea."""
+
+    homepage = "https://github.com/python-trio/sphinxcontrib-trio"
+    url = "https://files.pythonhosted.org/packages/ca/33/ee48d86e30bb3c5d72a47f49b1ebf5c23dd253b04d8d5fc3e6c68407a03e/sphinxcontrib-trio-1.1.2.tar.gz"
+
+    version('1.1.2', sha256='9f1ba9c1d5965b534e85258d8b677dd94e9b1a9a2e918b85ccd42590596b47c0')
+    version('1.1.0', sha256='d90f46d239ba0556e53d9a110989f98c9eb2cea76ab47937a1f39b62f63fe654')
+
+    depends_on('py-sphinx@1.7:')
+
+    patch('sphinxcontrib-trio.patch', when='@1.1.0')
diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-trio/sphinxcontrib-trio.patch b/var/spack/repos/builtin/packages/py-sphinxcontrib-trio/sphinxcontrib-trio.patch
new file mode 100644
index 0000000000..49465f4a11
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-trio/sphinxcontrib-trio.patch
@@ -0,0 +1,10 @@
+diff -urN a/setup.py b/setup.py
+--- a/setup.py	2019-08-01 10:44:29.583879243 +0200
++++ b/setup.py	2019-08-01 11:57:01.815819059 +0200
+@@ -32,4 +32,5 @@
+         "Framework :: Twisted",
+         "Topic :: Documentation :: Sphinx",
+         "Topic :: Software Development :: Documentation",
+-    ])
++    ],
++    namespace_packages=['sphinxcontrib'])