diff --git a/.gitignore b/.gitignore
index ca56e5c..612f4cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /pkgconfig-1.2.2.tar.gz
 /pkgconfig-1.3.1.tar.gz
 /pkgconfig-1.5.0.tar.gz
+/pkgconfig-1.5.1.tar.gz
diff --git a/python-pkgconfig.spec b/python-pkgconfig.spec
index f936478..d275c9a 100644
--- a/python-pkgconfig.spec
+++ b/python-pkgconfig.spec
@@ -1,7 +1,12 @@
 %global srcname pkgconfig
+%if 0%{?fedora} && 0%{?fedora} <= 30
+%bcond_with python2
+%else
+%bcond_without python2
+%endif
 
 Name:           python-%{srcname}
-Version:        1.5.0
+Version:        1.5.1
 Release:        1%{?dist}
 Summary:        Python interface to the pkg-config command line tool
 
@@ -24,6 +29,7 @@ It can be used to
 
 If pkg-config is not on the path, raises EnvironmentError.
 
+%if %{with python2}
 %package -n python2-%{srcname}
 Summary:        Python2 interface to the pkg-config ocmmand line tool
 %{?python_provide:%python_provide python2-%{srcname}}
@@ -45,11 +51,13 @@ It can be used to
 If pkg-config is not on the path, raises EnvironmentError.
 
 Python 2 version.
+%endif
 
 %package -n python3-%{srcname}
 Summary:        Python3 interface to the pkg-config command line tool
 %{?python_provide:%python_provide python3-%{srcname}}
 BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
 Requires:       %{_bindir}/pkg-config
 
 %description -n python3-%{srcname}
@@ -69,28 +77,42 @@ Python 3 version.
 
 %prep
 %autosetup -n %{srcname}-%{version}
+# We need to keep egg-info as a directory
+# https://github.com/sdispater/poetry/issues/866
+sed -i -e s/distutils.core/setuptools/ setup.py
 
 %build
+%if %{with python2}
 %py2_build
+%endif
 %py3_build
 
 %install
+%if %{with python2}
 %py2_install
+%endif
 %py3_install
 
+%if %{with python2}
 %files -n python2-%{srcname}
 %license LICENSE
 %doc README.rst
-%{python2_sitelib}/%{srcname}-*.egg-info
+%{python2_sitelib}/%{srcname}-*.egg-info/
 %{python2_sitelib}/%{srcname}/
+%endif
 
 %files -n python3-%{srcname}
 %license LICENSE
 %doc README.rst
-%{python3_sitelib}/%{srcname}-*.egg-info
+%{python3_sitelib}/%{srcname}-*.egg-info/
 %{python3_sitelib}/%{srcname}/
 
 %changelog
+* Mon Apr  1 2019 Orion Poplawski <orion@nwra.com> - 1.5.1-1
+- Update to 1.5.1
+- Patch setup.py to revert to setuptools
+- Drop python2 for Fedora 31+ (bug #1694619)
+
 * Sun Mar 31 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.5.0-1
 - Update to 1.5.0
 
diff --git a/sources b/sources
index aaf6c5a..01e03d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pkgconfig-1.5.0.tar.gz) = 01b4a46f953e92bd5ee9798d1a6c328f9d79d5b8df422e82a73edaa5e9b77d3c7fd4133dc26e10e7bcd20aafcd48df31ff7aef63cb6cd80b00ccd106b1158d29
+SHA512 (pkgconfig-1.5.1.tar.gz) = 1fd9aa973bd20a8fab864722598f1d19b94c23c7f2b522556b3182b19fe016bda7aa2be5e48a1b8fefa70a069611007d6d790e24defcb462e4594a382de85b00