diff --git a/python-pid.spec b/python-pid.spec
index 384879f..edd078d 100644
--- a/python-pid.spec
+++ b/python-pid.spec
@@ -71,7 +71,7 @@ BuildRequires:  python%{python3_pkgversion}-nose
 # This needs to have a blank line after because of a bug in the EL6 macros
 %autosetup -p1 -n %{srcname}-%{version}
 
-rm -rf *.egg-info
+rm -rf %{srcname}.egg-info
 
 %build
 %if %{with python2}
@@ -106,16 +106,16 @@ rm -rf *.egg-info
 %files -n python2-%{srcname}
 %license LICENSE
 %doc AUTHORS CHANGELOG README.rst
-%{python2_sitelib}/pid
-%{python2_sitelib}/pid*.egg-info*
+%{python2_sitelib}/%{srcname}
+%{python2_sitelib}/%{srcname}-%{version}-py%{python2_version}.egg-info
 %endif
 
 %if %{with python3}
 %files -n python%{python3_pkgversion}-%{srcname}
 %license LICENSE
 %doc AUTHORS CHANGELOG README.rst
-%{python3_sitelib}/pid
-%{python3_sitelib}/pid-*.egg-info
+%{python3_sitelib}/%{srcname}
+%{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info
 %endif
 
 %changelog