diff --git a/python-rpm-generators.spec b/python-rpm-generators.spec
index 352adb4..984ed7d 100644
--- a/python-rpm-generators.spec
+++ b/python-rpm-generators.spec
@@ -4,8 +4,8 @@
 
 Name:           python-rpm-generators
 Summary:        Dependency generators for Python RPMs
-Version:        5
-Release:        4%{?dist}
+Version:        6
+Release:        1%{?dist}
 
 # Originally all those files were part of RPM, so license is kept here
 License:        GPLv2+
@@ -49,6 +49,9 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} pythondeps.sh pythondistdeps.py
 %{_rpmconfigdir}/pythondistdeps.py
 
 %changelog
+* Wed Oct 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 6-1
+- Tighten regex for depgen
+
 * Sat Jul 28 2018 Miro Hrončok <mhroncok@redhat.com> - 5-4
 - Use nonstandardlib for purelib definition (#1609492)
 
diff --git a/python.attr b/python.attr
index 0f3c2cc..f5d2dff 100644
--- a/python.attr
+++ b/python.attr
@@ -1,4 +1,4 @@
 %__python_provides	%{_rpmconfigdir}/pythondeps.sh --provides
 %__python_requires	%{_rpmconfigdir}/pythondeps.sh --requires
-%__python_path	^((/usr/lib(64)?/python[[:digit:]]\\.[[:digit:]]/.*\\.(py[oc]?|so))|(%{_bindir}/python[[:digit:]]\\.[[:digit:]]))$
+%__python_path	^((/usr/lib(64)?/python[[:digit:]]\\.[[:digit:]]+/.*\\.(py[oc]?|so))|(^%{_bindir}/python[[:digit:]]\\.[[:digit:]]+))$
 %__python_magic		[Pp]ython.*(executable|byte-compiled)
diff --git a/pythondist.attr b/pythondist.attr
index c9af54c..28535b5 100644
--- a/pythondist.attr
+++ b/pythondist.attr
@@ -1,3 +1,3 @@
 %__pythondist_provides	%{_rpmconfigdir}/pythondistdeps.py --provides --majorver-provides
 #%__pythondist_requires	%{_rpmconfigdir}/pythondistdeps.py --requires
-%__pythondist_path		^/usr/lib(64)?/python[[:digit:]]\\.[[:digit:]]/.*\\.(dist.*|egg.*)$
+%__pythondist_path		^/usr/lib(64)?/python[[:digit:]]\\.[[:digit:]]+/site-packages/[^/]+\\.(dist-info|egg-info|egg-link)$