diff --git a/python-mutagen.spec b/python-mutagen.spec
index 48ec82b..7774892 100644
--- a/python-mutagen.spec
+++ b/python-mutagen.spec
@@ -4,13 +4,15 @@
 
 Name:           python-%{modname}
 Version:        1.42.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Mutagen is a Python module to handle audio meta-data
 
 License:        GPLv2+
 URL:            https://github.com/quodlibet/mutagen
 Source0:        %{url}/releases/download/release-%{version}/%{modname}-%{version}.tar.gz
 
+Patch0:         0001-pycodestyle-fix-new-warnings.patch
+
 BuildArch:      noarch
 
 %global _description \
@@ -44,6 +46,7 @@ BuildRequires:  python3-hypothesis
 BuildRequires:  python3-pytest
 BuildRequires:  python3-pytest-flakes
 BuildRequires:  python3-pycodestyle
+BuildRequires:  python3-sphinx_rtd_theme
 
 %description -n python3-%{modname} %{_description}
 
@@ -57,7 +60,7 @@ BuildRequires:  %{_bindir}/sphinx-build
 Contains the html documentation for python mutagen.
 
 %prep
-%autosetup -n %{modname}-%{version}
+%autosetup -n %{modname}-%{version} -p1
 
 %build
 %py2_build
@@ -102,6 +105,10 @@ mv tests/quality/test_pyflakes.py tests/quality/test_pyflakes.py.broken
 %doc docs/_build/*
 
 %changelog
+* Sun Jun 23 2019 Michele Baldessari <michele@acksyn.org> - 1.42.0-3
+- Explicitely add python3-sphinx_rtd_theme as build deps (should fix rhbz#1716509)
+- Add a patch to fix tests due to over-indenting
+
 * Sun Feb 10 2019 Michele Baldessari <michele@acksyn.org> - 1.42.0-2
 - Move from pytest-pep8 to pycodestyle