diff --git a/python-zope-contenttype.spec b/python-zope-contenttype.spec
index c1deb2b..56388ef 100644
--- a/python-zope-contenttype.spec
+++ b/python-zope-contenttype.spec
@@ -1,9 +1,13 @@
+%if 0%{?fedora}
+%global with_python3 1
+%endif
+
 %global modname zope.contenttype
 
 Summary: Content-Type Handling Utility
 Name: python-zope-contenttype
 Version: 4.1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.tar.gz
 License: ZPLv2.1
 Group: Development/Libraries
@@ -13,29 +17,76 @@ URL: http://pypi.python.org/pypi/zope.contenttype
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
 
+%if 0%{?with_python3}
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+%endif
+
 %description
 This package provides a utility module for content-type handling.
 
+%package -n python2-zope-contenttype
+Summary: Content-Type Handling Utility
+%{?python_provide:%python_provide python2-zope-contenttype}
+Requires:       python2
+
+%description -n python2-zope-contenttype
+This package provides a utility module for content-type handling.
+
+%if 0%{?with_python3}
+%package -n python3-zope-contenttype
+Summary: Content-Type Handling Utility
+%{?python_provide:%python_provide python3-zope-contenttype}
+Requires:       python3
+
+%description -n python3-zope-contenttype
+This package provides a utility module for content-type handling.
+%endif
+
 %prep
 %setup -q -n %{modname}-%{version}
 
 %build
-%{__python} setup.py build --quiet
+%py2_build
+%if 0%{?with_python3}
+%py3_build
+%endif
 
 %install
-%{__python} setup.py install --quiet --root=$RPM_BUILD_ROOT
-
-%files
-%doc CHANGES.rst COPYRIGHT.txt LICENSE.txt README.rst
-%{python_sitelib}/zope/contenttype/
-%dir %{python_sitelib}/zope/
-%{python_sitelib}/%{modname}-*.egg-info
-%{python_sitelib}/%{modname}-*-nspkg.pth
+%py2_install
+%if 0%{?with_python3}
+%py3_install
+%endif
 
 %check
-%{__python} setup.py test
+%{__python2} setup.py test
+%if 0%{?with_python3}
+%{__python3} setup.py test
+%endif
+
+%files -n python2-zope-contenttype
+%doc CHANGES.rst COPYRIGHT.txt README.rst
+%license LICENSE.txt
+%{python2_sitelib}/zope/contenttype/
+%dir %{python2_sitelib}/zope/
+%{python2_sitelib}/%{modname}-*.egg-info
+%{python2_sitelib}/%{modname}-*-nspkg.pth
+
+%if 0%{?with_python3}
+%files -n python3-zope-contenttype
+%doc CHANGES.rst COPYRIGHT.txt README.rst
+%license LICENSE.txt
+%{python3_sitelib}/zope/contenttype/
+%dir %{python3_sitelib}/zope/
+%{python3_sitelib}/%{modname}-*.egg-info
+%{python3_sitelib}/%{modname}-*-nspkg.pth
+%endif
 
 %changelog
+* Tue Apr 05 2016 Ralph Bean <rbean@redhat.com> - 4.1.0-4
+- Modernize python macros.
+- Add python3 subpackage.
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild