diff --git a/python-stomper.spec b/python-stomper.spec
index 26c1db7..6d8be38 100644
--- a/python-stomper.spec
+++ b/python-stomper.spec
@@ -1,26 +1,15 @@
-%if 0%{?rhel} && 0%{?rhel} <= 6
-%{!?__python2:        %global __python2 /usr/bin/python2}
-%{!?python2_sitelib:  %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%endif
-
+%{?python_enable_dependency_generator}
 %if 0%{?fedora}
 %global with_python3 1
 %endif
 
-%{!?py2ver: %global py2ver %(%{?__python2} -c 'import sys; print(sys.version[0:3])' 2>/dev/null)}
-%if 0%{?with_python3}
-%{!?py3ver: %global py3ver %(%{?__python3} -c 'import sys; print(sys.version[0:3])' 2>/dev/null)}
-%endif
-
 %global commit 9b9fddf596a77e6b7e0407f0e45d02ca3a5ba5e1
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           python-stomper
 Version:        0.4.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A python client implementation of the STOMP protocol
-Group:          Development/Languages
 License:        ASL 2.0
 URL:            https://pypi.io/project/stomper
 
@@ -35,19 +24,14 @@ create and parse STOMP messages in a programatic fashion.
 
 %package -n python2-stomper
 Summary:        A python client implementation of the STOMP protocol
-Group:          Development/Languages
 %{?python_provide:%python_provide python2-stomper}
 
 BuildRequires:  python2-devel
 BuildRequires:  python2-setuptools
 BuildRequires:  python2-nose
 BuildRequires:  python2-future
-
+%if %{undefined __pythondist_requires}
 Requires:       python2-future
-
-%if 0%{?el5}
-BuildRequires:  python-uuid
-Requires:       python-uuid
 %endif
 
 %description -n python2-stomper
@@ -58,7 +42,6 @@ create and parse STOMP messages in a programatic fashion.
 %if 0%{?with_python3}
 %package -n python3-stomper
 Summary:        A python client implementation of the STOMP protocol
-Group:          Development/Languages
 %{?python_provide:%python_provide python3-stomper}
 
 BuildRequires:  python3-devel
@@ -87,9 +70,9 @@ create and parse STOMP messages in a programatic fashion.
 %endif
 
 %check
-PYTHONPATH=. nosetests-%{py2ver} -q
+PYTHONPATH=. nosetests-%{python2_version} -q
 %if 0%{?with_python3}
-PYTHONPATH=. nosetests-%{py3ver} -q
+PYTHONPATH=. nosetests-%{python3_version} -q
 %endif
 
 %files -n python2-stomper
@@ -103,6 +86,9 @@ PYTHONPATH=. nosetests-%{py3ver} -q
 %endif
 
 %changelog
+* Wed Jan 02 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.4.1-9
+- Enable python dependency generator
+
 * Tue Dec 18 2018 Ralph Bean <rbean@redhat.com> - 0.4.1-8
 - Complete py3 conditionals in preparation for a epel7 update.