diff --git a/python-sphinx-autodoc-typehints.changes b/python-sphinx-autodoc-typehints.changes
index 0753114..468fe39 100644
--- a/python-sphinx-autodoc-typehints.changes
+++ b/python-sphinx-autodoc-typehints.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Jul  3 09:13:37 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Add patch to fix build with new sphinx:
+  * sphinx21.patch
+
+-------------------------------------------------------------------
+Thu Jun  6 13:41:01 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Drop not really needed devel dependency
+
 -------------------------------------------------------------------
 Sat Mar 23 14:37:28 UTC 2019 - Sebastian Wagner <sebix+novell.com@sebix.at>
 
diff --git a/python-sphinx-autodoc-typehints.spec b/python-sphinx-autodoc-typehints.spec
index b913cb6..b4de616 100644
--- a/python-sphinx-autodoc-typehints.spec
+++ b/python-sphinx-autodoc-typehints.spec
@@ -24,23 +24,22 @@ Release:        0
 Summary:        Type hints (PEP 484) support for the Sphinx autodoc extension
 License:        MIT
 Group:          Development/Languages/Python
-Url:            https://github.com/agronholm/sphinx-autodoc-typehints
+URL:            https://github.com/agronholm/sphinx-autodoc-typehints
 Source:         https://files.pythonhosted.org/packages/source/s/sphinx-autodoc-typehints/sphinx-autodoc-typehints-%{version}.tar.gz
-Requires:       python-Sphinx
-Requires:       python-typing_extensions
-BuildRequires:  %{python_module devel}
+Patch0:         sphinx21.patch
 BuildRequires:  %{python_module setuptools >= 36.2.7}
 BuildRequires:  %{python_module setuptools_scm >= 1.7.0}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+Requires:       python-Sphinx >= 1.7
+Requires:       python-typing_extensions
+BuildArch:      noarch
 # SECTION tests
 BuildRequires:  %{python_module Sphinx >= 1.7}
 BuildRequires:  %{python_module pathlib}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module typing_extensions}
 # /SECTION
-BuildArch:      noarch
-
 %python_subpackages
 
 %description
@@ -49,6 +48,7 @@ and return value types of functions.
 
 %prep
 %setup -q -n sphinx-autodoc-typehints-%{version}
+%patch0 -p1
 
 %build
 %python_build
diff --git a/sphinx21.patch b/sphinx21.patch
new file mode 100644
index 0000000..b68447f
--- /dev/null
+++ b/sphinx21.patch
@@ -0,0 +1,22 @@
+From 367e32cea5218af9d8df9800bde395cc285e0fad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
+Date: Mon, 3 Jun 2019 00:11:22 +0300
+Subject: [PATCH] Fixed tests failing on Sphinx 2.1+
+
+---
+ tests/test_sphinx_autodoc_typehints.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_sphinx_autodoc_typehints.py b/tests/test_sphinx_autodoc_typehints.py
+index b751176..d83f484 100644
+--- a/tests/test_sphinx_autodoc_typehints.py
++++ b/tests/test_sphinx_autodoc_typehints.py
+@@ -231,7 +231,7 @@ class InnerClass
+               Return type:
+                  "str"
+ 
+-           a_property
++           property a_property
+ 
+               Property docstring
+