diff --git a/python-XStatic-Bootstrap-Datepicker.spec b/python-XStatic-Bootstrap-Datepicker.spec
index 0fc9964..bcf2edc 100644
--- a/python-XStatic-Bootstrap-Datepicker.spec
+++ b/python-XStatic-Bootstrap-Datepicker.spec
@@ -1,60 +1,134 @@
-# Created by pyp2rpm-1.1.1
+%if 0%{?fedora}
+%global with_python3 1
+%endif
+
 %global pypi_name XStatic-Bootstrap-Datepicker
 
 Name:           python-%{pypi_name}
 Version:        1.3.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Bootstrap-Datepicker (XStatic packaging standard)
 
 License:        ASL 2.0
 URL:            https://github.com/eternicode/bootstrap-datepicker/
-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
 
+%description
+JavaScript library 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.
+
+%package -n python2-%{pypi_name}
+Summary:        %{summary}
+
 BuildRequires:  python2-devel
-BuildRequires:  python-setuptools
-BuildRequires:  web-assets-devel
+BuildRequires:  python2-setuptools
 
-Requires: python-XStatic
-Requires: web-assets-filesystem
+Requires:       python2-XStatic
+Requires:       xstatic-bootstrap-datepicker-common
 
-%description
-Bootstrap-Datepicker JavaScript library packaged for setuptools 
-(easy_install) / pip.
+%{?python_provide:%python_provide python2-%{pypi_name}}
+
+%description -n python2-%{pypi_name}
+JavaScript library 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.
 
-%prep
-%setup -q -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf XStatic_Bootstrap_Datepicker.egg-info
+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
+Requires:       xstatic-bootstrap-datepicker-common
+
+%{?python_provide:%python_provide python3-%{pypi_name}}
+
+%description -n python3-%{pypi_name}
+JavaScript library 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
+
+%package -n xstatic-bootstrap-datepicker-common
+Summary:        %{summary}
+
+BuildRequires:  web-assets-devel
+Requires:       web-assets-filesystem
 
+%description -n xstatic-bootstrap-datepicker-common
+JavaScript library 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 contains the javascript files.
+
+%prep
+%autosetup -n %{pypi_name}-%{version}
+# patch to use webassets dir
 sed -i "s|^BASE_DIR = .*|BASE_DIR = '%{_jsdir}/bootstrap_datepicker'|" xstatic/pkg/bootstrap_datepicker/__init__.py
 
 %build
-# due
-# https://bitbucket.org/thomaswaldmann/xstatic/issue/2/
-# this package can not be built with python-XStatic installed.
-%{__python2} setup.py build
-
+%py2_build
+%if 0%{?with_python3}
+%py3_build
+%endif
 
 %install
-%{__python2} setup.py install --skip-build --root %{buildroot}
+%py2_install
+mkdir -p %{buildroot}%{_jsdir}/bootstrap_datepicker
+mv %{buildroot}%{python2_sitelib}/xstatic/pkg/bootstrap_datepicker/data/* %{buildroot}%{_jsdir}/bootstrap_datepicker
+rmdir %{buildroot}%{python2_sitelib}/xstatic/pkg/bootstrap_datepicker/data/
+# fix execute flags for js
+chmod 644 %{buildroot}%{_jsdir}/bootstrap_datepicker/bootstrap-datepicker.js
+
+%if 0%{?with_python3}
+%py3_install
+# Remove static files, already created by the python2 subpkg
+rm -rf %{buildroot}%{python3_sitelib}/xstatic/pkg/bootstrap_datepicker/data
+%endif
+
+%files -n python2-%{pypi_name}
+%doc README.txt
+%{python2_sitelib}/xstatic/pkg/bootstrap_datepicker
+%{python2_sitelib}/XStatic_Bootstrap_Datepicker-%{version}-py%{python2_version}.egg-info
+%{python2_sitelib}/XStatic_Bootstrap_Datepicker-%{version}-py%{python2_version}-nspkg.pth
 
-mkdir -p %{buildroot}/%{_jsdir}/bootstrap_datepicker
-mv %{buildroot}/%{python2_sitelib}/xstatic/pkg/bootstrap_datepicker/data/* %{buildroot}/%{_jsdir}/bootstrap_datepicker
+%if 0%{?with_python3}
+%files -n python3-%{pypi_name}
+%doc README.txt
+%{python3_sitelib}/xstatic/pkg/bootstrap_datepicker
+%{python3_sitelib}/XStatic_Bootstrap_Datepicker-%{version}-py%{python3_version}.egg-info
+%{python3_sitelib}/XStatic_Bootstrap_Datepicker-%{version}-py%{python3_version}-nspkg.pth
+%endif
 
-%files
+%files -n xstatic-bootstrap-datepicker-common
 %doc README.txt
-%{python2_sitelib}/xstatic/pkg/bootstrap_datepicker
-%{python2_sitelib}/XStatic_Bootstrap_Datepicker-%{version}-py%{python_version}.egg-info
-%{python2_sitelib}/XStatic_Bootstrap_Datepicker-%{version}-py%{python_version}-nspkg.pth
 %{_jsdir}/bootstrap_datepicker
 
 %changelog
+* Wed Oct 12 2016 Jan Beran <jberan@redhat.com> - 1.3.1.0-5
+- Provides a Python 3 subpackage
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1.0-4
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 
@@ -66,3 +140,4 @@ mv %{buildroot}/%{python2_sitelib}/xstatic/pkg/bootstrap_datepicker/data/* %{bui
 
 * Fri Sep 19 2014 Matthias Runge <mrunge@redhat.com> - 1.3.1.0-1
 - Initial package.
+