diff --git a/python-virtualenv.spec b/python-virtualenv.spec
index a4fc11c..bcfaacd 100644
--- a/python-virtualenv.spec
+++ b/python-virtualenv.spec
@@ -8,7 +8,7 @@
 
 Name:           python-virtualenv
 Version:        13.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tool to create isolated Python environments
 
 Group:          Development/Languages
@@ -32,16 +32,28 @@ BuildRequires:  python3-sphinx
 
 %endif # with_python3
 
-Requires:       python-setuptools
-Requires:       python2-devel
-
 %description
 virtualenv is a tool to create isolated Python environments. virtualenv
 is a successor to workingenv, and an extension of virtual-python. It is
 written by Ian Bicking, and sponsored by the Open Planning Project. It is
 licensed under an MIT-style permissive license.
 
-%if 0%{?fedora} > 0
+
+%package -n     python2-virtualenv
+Summary:        Tool to create isolated Python environments
+
+Requires:       python2-setuptools
+Requires:       python2-devel
+%{?python_provide:%python_provide python2-virtualenv}
+
+%description -n python2-virtualenv
+virtualenv is a tool to create isolated Python environments. virtualenv
+is a successor to workingenv, and an extension of virtual-python. It is
+written by Ian Bicking, and sponsored by the Open Planning Project. It is
+licensed under an MIT-style permissive license
+
+
+%if 0%{?fedora}
 %package -n     python-virtualenv-doc
 Summary:        Documentation for python virtualenv
 
@@ -55,6 +67,7 @@ Summary:        Tool to create isolated Python environments
 
 Requires:       python3-setuptools
 Requires:       python3-devel
+%{?python_provide:%python_provide python3-virtualenv}
 
 %description -n python3-virtualenv
 virtualenv is a tool to create isolated Python environments. virtualenv
@@ -68,53 +81,44 @@ licensed under an MIT-style permissive license
 %setup -q -n virtualenv-%{version}
 %{__sed} -i -e "1s|#!/usr/bin/env python||" virtualenv.py 
 
-%if 0%{?with_python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-%endif # with_python3
-
 %build
 # Build code
-%{__python2} setup.py build
+%{py2_build}
 
 # Build docs on Fedora
-%if 0%{?fedora} > 0
+%if 0%{?fedora}
 %{__python2} setup.py build_sphinx
 rm -f build/sphinx/html/.buildinfo
 %endif
 
 %if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py build
+%{py3_build}
 
 # Build docs on Fedora
-%if 0%{?fedora} > 0
+%if 0%{?fedora}
 %{__python3} setup.py build_sphinx
 rm -f build/sphinx/html/.buildinfo
 %endif
-
-popd
 %endif # with_python3
 
 %install
 %if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py install --skip-build --root %{buildroot}
+%{py3_install}
 # rename binaries to use python3
 mv %{buildroot}/%{_bindir}/virtualenv %{buildroot}/%{_bindir}/py3-virtualenv
-popd
 %endif # with_python3
 
-%{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT
+%{py2_install}
 
-%files
-%doc docs/*rst PKG-INFO AUTHORS.txt LICENSE.txt
+%files -n python2-virtualenv
+%license LICENSE.txt
+%doc docs/*rst PKG-INFO AUTHORS.txt
 
 %{python2_sitelib}/*
 %{_bindir}/virtualenv
 %{_bindir}/virtualenv-%{python2_version}
 
-%if 0%{?fedora} > 0
+%if 0%{?fedora}
 # Include sphinx docs on Fedora
 %files -n python-virtualenv-doc
 %doc build/sphinx/*
@@ -122,15 +126,23 @@ popd
 
 %if 0%{?with_python3}
 %files -n python3-virtualenv
-%doc docs/*rst PKG-INFO AUTHORS.txt LICENSE.txt
+%license LICENSE.txt
+%doc docs/*rst PKG-INFO AUTHORS.txt
 %{_bindir}/py3-virtualenv
 %{_bindir}/virtualenv-%{python3_version}
-%{python3_sitelib}/*
+%{python3_sitelib}/virtualenv.py
+%{python3_sitelib}/virtualenv_support/
+%{python3_sitelib}/virtualenv-*.egg-info/
+%{python3_sitelib}/__pycache__/*
 %endif
 
 
 
 %changelog
+* Tue Feb 2 2016 Orion Poplawski <orion@cora.nwra.com> - 13.1.2-4
+- Modernize spec
+- Fix python3 package file ownership
+
 * Wed Dec 2 2015 Orion Poplawski <orion@cora.nwra.com> - 13.1.2-3
 - Move documentation to separate package (bug #1219139)