diff --git a/python-XStatic-Font-Awesome.spec b/python-XStatic-Font-Awesome.spec
index cad4fa8..4cb2b5f 100644
--- a/python-XStatic-Font-Awesome.spec
+++ b/python-XStatic-Font-Awesome.spec
@@ -1,10 +1,12 @@
-%global pypi_name XStatic-Font-Awesome
+%if 0%{?fedora}
+%global with_python3 1
+%endif
 
-%{!?__python2:%global __python2 %{__python}}
+%global pypi_name XStatic-Font-Awesome
 
 Name:           python-%{pypi_name}
 Version:        4.3.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Font-Awesome (XStatic packaging standard)
 
 # font awesome is licensed under SIL 1.1.
@@ -13,43 +15,76 @@ Summary:        Font-Awesome (XStatic packaging standard)
 # Code is distributed under MIT
 License:        OFL and MIT
 URL:            https://fortawesome.github.io/Font-Awesome/
-Source0:        https://pypi.python.org/packages/source/X/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+Source0:        https://files.pythonhosted.org/packages/source/X/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 BuildArch:      noarch
 
-BuildRequires:  python2-devel
-BuildRequires:  python-setuptools
 BuildRequires:  web-assets-devel
-BuildRequires:  fontawesome-fonts
-BuildRequires:  fontawesome-fonts-web
-
-Requires: python-XStatic
-Requires: web-assets-filesystem
-Requires: fontawesome-fonts-web >= 4.1.0
-Requires: fontawesome-fonts
 
+Requires:       web-assets-filesystem
+Requires:       fontawesome-fonts-web >= 4.1.0
+Requires:       fontawesome-fonts
 
 %description
 Font Awesome icons packaged for setuptools (easy_install) / pip.
 
 This package is intended to be used by any project that needs these files.
 
-It intentionally does not provide any extra code
-except some metadata nor has any extra requirements.
+It intentionally does not provide any extra code except some metadata
+nor has any extra requirements.
 
+%package -n python2-%{pypi_name}
+Summary:        %{summary}
 
-%prep
-%setup -q -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
+BuildRequires:  python2-devel
+BuildRequires:  python2-setuptools
 
+Requires:       python2-XStatic
 
+%{?python_provide:%python_provide python2-%{pypi_name}}
 
-%build
-%{__python2} setup.py build
+%description -n python2-%{pypi_name}
+Font Awesome icons packaged for setuptools (easy_install) / pip.
+
+This package is intended to be used by any project that needs these files.
+
+It intentionally does not provide any extra code except some metadata
+nor has any extra requirements.
+
+This package provides Python 2 build of %{pypi_name}.
+
+%if 0%{?with_python3}
+%package -n python3-%{pypi_name}
+Summary:        %{summary}
+
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+
+Requires:       python3-XStatic
+
+%{?python_provide:%python_provide python3-%{pypi_name}}
+
+%description -n python3-%{pypi_name}
+Font Awesome icons packaged for setuptools (easy_install) / pip.
 
+This package is intended to be used by any project that needs these files.
+
+It intentionally does not provide any extra code except some metadata
+nor has any extra requirements.
+
+This package provides Python 3 build of %{pypi_name}.
+%endif
+
+%prep
+%autosetup -n %{pypi_name}-%{version}
+
+%build
+%py2_build
+%if 0%{?with_python3}
+%py3_build
+%endif
 
 %install
-%{__python2} setup.py install --skip-build --root %{buildroot}
+%py2_install
 
 # use fontawesome-fonts directly
 rm -f %{buildroot}/%{python2_sitelib}/xstatic/pkg/font_awesome/data/fonts/*
@@ -61,15 +96,40 @@ rm -rf %{buildroot}/%{python2_sitelib}/xstatic/pkg/font_awesome/data/$dir
 ln -s %{_datadir}/font-awesome-web/$dir %{buildroot}/%{python2_sitelib}/xstatic/pkg/font_awesome/data/$dir
 done
 
+%if 0%{?with_python3}
+
+%py3_install
+
+# use fontawesome-fonts directly
+rm -f %{buildroot}/%{python3_sitelib}/xstatic/pkg/font_awesome/data/fonts/*
+ln -s %{_datadir}/fonts/fontawesome/*  %{buildroot}/%{python3_sitelib}/xstatic/pkg/font_awesome/data/fonts/
+
+# use fontawesome-fonts-web for css, scss,
+for dir in css less scss ; do
+rm -rf %{buildroot}/%{python3_sitelib}/xstatic/pkg/font_awesome/data/$dir
+ln -s %{_datadir}/font-awesome-web/$dir %{buildroot}/%{python3_sitelib}/xstatic/pkg/font_awesome/data/$dir
+done
 
+%endif
 
-%files
+%files -n python2-%{pypi_name}
 %doc README.txt
 %{python2_sitelib}/xstatic/pkg/font_awesome
-%{python2_sitelib}/XStatic_Font_Awesome-%{version}-py%{python_version}.egg-info
-%{python2_sitelib}/XStatic_Font_Awesome-%{version}-py%{python_version}-nspkg.pth
+%{python2_sitelib}/XStatic_Font_Awesome-%{version}-py%{python2_version}.egg-info
+%{python2_sitelib}/XStatic_Font_Awesome-%{version}-py%{python2_version}-nspkg.pth
+
+%if 0%{?with_python3}
+%files -n python3-%{pypi_name}
+%doc README.txt
+%{python3_sitelib}/xstatic/pkg/font_awesome
+%{python3_sitelib}/XStatic_Font_Awesome-%{version}-py%{python3_version}.egg-info
+%{python3_sitelib}/XStatic_Font_Awesome-%{version}-py%{python3_version}-nspkg.pth
+%endif
 
 %changelog
+* Thu Oct 13 2016 Jan Beran <jberan@redhat.com> - 4.3.0.0-4
+- Provides a Python 3 subpackage
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.3.0.0-3
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 
@@ -93,3 +153,4 @@ done
 
 * Wed Sep 10 2014 Matthias Runge <mrunge@redhat.com> - 4.1.0.0-1
 - Initial package. (rhbz#1140377)
+