diff --git a/0001-Fix-compatibility-with-Sphinx-2.1.patch b/0001-Fix-compatibility-with-Sphinx-2.1.patch
new file mode 100644
index 0000000..61ed744
--- /dev/null
+++ b/0001-Fix-compatibility-with-Sphinx-2.1.patch
@@ -0,0 +1,27 @@
+From 487417bd15da1a1c02dc0dff15409402af20b95f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
+Date: Thu, 25 Jul 2019 16:56:31 +0200
+Subject: [PATCH] Fix compatibility with Sphinx >= 2.1
+
+Workaround https://github.com/sphinx-doc/sphinx/issues/6474
+---
+ cornice_sphinx/__init__.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/cornice_sphinx/__init__.py b/cornice_sphinx/__init__.py
+index c26d4c7..662ee43 100644
+--- a/cornice_sphinx/__init__.py
++++ b/cornice_sphinx/__init__.py
+@@ -71,6 +71,9 @@ class ServiceDirective(Directive):
+         super(ServiceDirective, self).__init__(*args, **kwargs)
+         self.env = self.state.document.settings.env
+ 
++    def get_field_type_map(self):
++        return {}
++
+     def run(self):
+         app_name = self.options.get('app')
+         if app_name:
+-- 
+2.21.0
+
diff --git a/python-cornice-sphinx.spec b/python-cornice-sphinx.spec
index c6c52eb..7b9297e 100644
--- a/python-cornice-sphinx.spec
+++ b/python-cornice-sphinx.spec
@@ -4,7 +4,7 @@
 Name:             python-cornice-sphinx
 Epoch:            1
 Version:          0.3
-Release:          8%{?dist}
+Release:          9%{?dist}
 BuildArch:        noarch
 
 License:          ASL 2.0 and MPLv2.0
@@ -13,6 +13,8 @@ URL:              https://github.com/Cornices/cornice.ext.sphinx
 Source0:          %{url}/archive/%{version}/%{module}-%{version}.tar.gz
 # https://github.com/Cornices/cornice.ext.sphinx/pull/14
 Patch0:           0000-Don-t-install-the-tests.patch
+# Workaound https://github.com/sphinx-doc/sphinx/issues/6474
+Patch1:           0001-Fix-compatibility-with-Sphinx-2.1.patch
 
 
 BuildRequires: %{py3_dist cornice} >= 3
@@ -61,6 +63,9 @@ PYTHONPATH="." nosetests-3 --exclude test_string_validator_resolved
 
 
 %changelog
+* Thu Jul 25 2019 Aurelien Bompard <abompard@fedoraproject.org> - 1:0.3-9
+- Add patch to work around https://github.com/sphinx-doc/sphinx/issues/6474
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild