diff --git a/compose-utils.spec b/compose-utils.spec
index 2539a91..6e2e17e 100644
--- a/compose-utils.spec
+++ b/compose-utils.spec
@@ -1,6 +1,6 @@
 Name:		compose-utils
 Version:	0.1.17
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Utilities for working with composes
 
 Group:		Development/Tools
@@ -9,21 +9,18 @@ URL:		https://pagure.io/compose-utils
 Source0:	https://pagure.io/releases/compose-utils/%{name}-%{version}.tar.bz2
 
 BuildRequires:	python2-devel
-BuildRequires:	python2-nose
-BuildRequires:	python-productmd >= 1.1
-BuildRequires:	python-freezegun
-BuildRequires:	python-mock
-BuildRequires:	kobo >= 0.4.2
-BuildRequires:	kobo-rpmlib
-Requires:	python-productmd >= 1.1
-Requires:	kobo >= 0.4.2
-Requires:	kobo-rpmlib
-Requires:	rsync
-
-%if 0%{?fedora} >= 27
-BuildRequires:  python2-koji
-Requires:       python2-koji
-%endif
+BuildRequires:	python2-productmd >= 1.1
+BuildRequires:	python2-freezegun
+BuildRequires:	python2-mock
+BuildRequires:	python2-kobo
+BuildRequires:	python2-kobo-rpmlib
+BuildRequires:	python%{python3_pkgversion}-devel
+BuildRequires:	python%{python3_pkgversion}-productmd >= 1.1
+BuildRequires:	python%{python3_pkgversion}-freezegun
+BuildRequires:	python%{python3_pkgversion}-mock
+BuildRequires:	python%{python3_pkgversion}-kobo
+BuildRequires:	python%{python3_pkgversion}-kobo-rpmlib
+Requires:		python3-%{name} = %{version}-%{release}
 
 BuildArch:	noarch
 
@@ -31,32 +28,71 @@ BuildArch:	noarch
 A set of tools for working with composes produced by pungi.
 
 
+%package -n python2-%{name}
+Summary:    Python 2 libraries supporting tools for working with composes
+Requires:	python2-productmd >= 1.1
+Requires:	python2-kobo >= 0.4.2
+Requires:	python2-kobo-rpmlib
+Requires:	rsync
+%{?python_provide:%python_provide python2-%{name}}
+
+%description -n python2-%{name}
+Python 2 libraries supporting tools for working with composes
+
+
+%package -n python%{python3_pkgversion}-%{name}
+Summary:    Python 3 libraries supporting tools for working with composes
+Requires:	python%{python3_pkgversion}-productmd >= 1.1
+Requires:	python%{python3_pkgversion}-kobo
+Requires:	python%{python3_pkgversion}-kobo-rpmlib
+Requires:	rsync
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
+
+%description -n python%{python3_pkgversion}-%{name}
+Python 3 libraries supporting tools for working with composes
+
+
 %prep
 %setup -q
 
 
 %build
 %py2_build
+%py3_build
 
 
 %install
 %py2_install
+%py3_install
 
 
 %check
-make test
+%{__python2} setup.py test
+%{__python3} setup.py test
 
 
 %files
 %defattr(-,root,root,-)
 %license COPYING GPL
 %doc AUTHORS README.rst
-%{python_sitelib}/*
 %{_bindir}/*
 %{_mandir}/man1/*
 
+%files -n python2-%{name}
+%license COPYING GPL
+%doc AUTHORS README.rst
+%{python2_sitelib}/*
+
+%files -n python%{python3_pkgversion}-%{name}
+%license COPYING GPL
+%doc AUTHORS README.rst
+%{python3_sitelib}/*
+
 
 %changelog
+* Mon Oct 23 2017 Lubomír Sedlář <lsedlar@redhat.com> - 0.1.17-2
+- Update packaging for Python 3
+
 * Mon Oct 02 2017 Lubomír Sedlář <lsedlar@redhat.com> - 0.1.17-1
 - Fix copying when compose path ends with slash