diff --git a/python-agate.spec b/python-agate.spec
index f914472..578c69a 100644
--- a/python-agate.spec
+++ b/python-agate.spec
@@ -1,3 +1,5 @@
+%{?python_enable_dependency_generator}
+
 %global pypi_name agate
 %global project_owner wireservice
 %global github_name agate
@@ -10,7 +12,7 @@ agate was previously known as journalism.
 
 Name:           python-%{pypi_name}
 Version:        1.6.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Data analysis library that is optimized for humans instead of machines
 
 License:        MIT
@@ -22,37 +24,6 @@ BuildArch:      noarch
 %{desc}
 
 
-%package -n     python2-%{pypi_name}
-BuildRequires:  python2-devel
-BuildRequires:  python2-nose >= 1.1.2
-BuildRequires:  python2-sphinx >= 1.2.2
-BuildRequires:  python2-coverage >= 3.7.1
-BuildRequires:  python2-sphinx_rtd_theme >= 0.1.6
-BuildRequires:  python2-mock >= 1.3.0
-BuildRequires:  python2-lxml >= 3.6.0
-BuildRequires:  python2-six >= 1.6.1
-BuildRequires:  python2-pytimeparse >= 1.1.5
-BuildRequires:  python2-parsedatetime >= 2.1
-BuildRequires:  python2-babel >= 2.0
-BuildRequires:  python2-isodate >= 0.5.4
-BuildRequires:  python2-slugify >= 1.2.1
-BuildRequires:  python2-leather >= 0.3.2
-BuildRequires:  python2-unittest2
-BuildRequires:  python2-cssselect
-Requires:       python2-six >= 1.6.1
-Requires:       python2-pytimeparse >= 1.1.5
-Requires:       python2-parsedatetime >= 2.1
-Requires:       python2-babel >= 2.0
-Requires:       python2-isodate >= 0.5.4
-Requires:       python2-slugify >= 1.2.1
-Requires:       python2-leather >= 0.3.2
-Summary:        %{summary}
-%{?python_provide:%python_provide python2-%{pypi_name}}
-
-%description -n python2-%{pypi_name}
-%{desc}
-
-
 %package -n     python3-%{pypi_name}
 Summary:        %{summary}
 BuildRequires:  python3-devel
@@ -60,22 +31,15 @@ BuildRequires:  python3-nose
 BuildRequires:  python3-coverage >= 3.7.1
 BuildRequires:  python3-mock >= 1.3.0
 BuildRequires:  python3-lxml >= 3.6.0
-BuildRequires:  python3-six >= 1.6.1
-BuildRequires:  python3-pytimeparse >= 1.1.5
-BuildRequires:  python3-parsedatetime >= 2.1
-BuildRequires:  python3-babel >= 2.0
-BuildRequires:  python3-isodate >= 0.5.4
-BuildRequires:  python3-slugify >= 1.2.1
-BuildRequires:  python3-leather >= 0.3.2
 BuildRequires:  python3-unittest2
 BuildRequires:  python3-cssselect
-Requires:       python3-six >= 1.6.1
-Requires:       python3-pytimeparse >= 1.1.5
-Requires:       python3-parsedatetime >= 2.1
-Requires:       python3-babel >= 2.0
-Requires:       python3-isodate >= 0.5.4
-Requires:       python3-slugify >= 1.2.1
-Requires:       python3-leather >= 0.3.2
+BuildRequires:  python3dist(six) >= 1.9.0
+BuildRequires:  python3dist(pytimeparse) >= 1.1.5
+BuildRequires:  python3dist(parsedatetime) >= 2.1
+BuildRequires:  python3dist(babel) >= 2.0
+BuildRequires:  python3dist(isodate) >= 0.5.4
+BuildRequires:  python3dist(python-slugify) >= 1.2.1
+BuildRequires:  python3dist(leather) >= 0.3.
 %{?python_provide:%python_provide python3-%{pypi_name}}
 
 %description -n python3-%{pypi_name}
@@ -84,6 +48,8 @@ Requires:       python3-leather >= 0.3.2
 
 %package -n    python-%{pypi_name}-doc
 Summary:       %{summary}
+BuildRequires:  python3dist(sphinx) >= 1.2.2
+BuildRequires:  python3dist(sphinx-rtd-theme) >= 0.1.6
 BuildArch:     noarch
 
 %description -n python-%{pypi_name}-doc
@@ -101,33 +67,23 @@ sed -i '1{\@^#!/usr/bin/env Python@d}' agate/testcase.py
 
 
 %build
-%py2_build
 %py3_build
 
 # Build documentation
 pushd docs
-    make html
+    make html SPHINXBUILD=sphinx-build-%{python3_version}
     rm -f _build/html/.buildinfo
 popd
 
 
 %install
 %py3_install
-%py2_install
 
 
 %check
-nosetests-%{python2_version} tests -v
 nosetests-%{python3_version} tests -v
 
 
-%files -n python2-%{pypi_name}
-%doc README.rst AUTHORS.rst CHANGELOG.rst
-%license COPYING
-%{python2_sitelib}/%{pypi_name}-%{version}-py%{python2_version}.egg-info/
-%{python2_sitelib}/%{pypi_name}/
-
-
 %files -n python3-%{pypi_name}
 %doc README.rst AUTHORS.rst CHANGELOG.rst
 %license COPYING
@@ -141,6 +97,10 @@ nosetests-%{python3_version} tests -v
 
 
 %changelog
+* Wed Jan 02 2019 Julien Enselme <jujens@jujens.eu> - 1.6.1-4
+- Remove Python 2 subpackage
+- Enable python dependency generator
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild